summaryrefslogtreecommitdiff
path: root/include/configs/km
diff options
context:
space:
mode:
authorPascal Linder <pascal.linder@edu.hefr.ch>2019-07-09 09:28:21 +0200
committerStefan Roese <sr@denx.de>2019-08-12 09:12:38 +0200
commit432579c4d1ee89da7322ff11f0424360df2b0d95 (patch)
tree2fd17187ba6fd517303b4c1b5826f5a19ee807c6 /include/configs/km
parent707f06f331096161d2ece57634cb816e46d1878a (diff)
km: remove obsolete definitions in KM header files
After moving the KM specific configurations to Kconfig, the associated preprocessor definitions can now be removed in the headers. Moreover, the whitelist has been adapted correspondingly. Signed-off-by: Pascal Linder <pascal.linder@edu.hefr.ch> Signed-off-by: Holger Brunck <holger.brunck@ch.abb.com> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/km')
-rw-r--r--include/configs/km/keymile-common.h6
-rw-r--r--include/configs/km/km-mpc83xx.h4
-rw-r--r--include/configs/km/km-powerpc.h13
-rw-r--r--include/configs/km/km_arm.h22
-rw-r--r--include/configs/km/kmp204x-common.h15
5 files changed, 0 insertions, 60 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index a83782e1cf..3106ef1d8c 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -27,12 +27,6 @@
#define CONFIG_LOADS_ECHO
#define CONFIG_SYS_LOADS_BAUD_CHANGE
-
-/* Support the IVM EEprom */
-#define CONFIG_SYS_IVM_EEPROM_ADR 0x50
-#define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400
-#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100
-
/*
* BOOTP options
*/
diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 455e5236de..c06143c68b 100644
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -3,8 +3,6 @@
*/
#define BOOTFLASH_START 0xF0000000
-#define CONFIG_KM_CONSOLE_TTY "ttyS0"
-
/*
* DDR Setup
*/
@@ -89,8 +87,6 @@
{0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \
{1, {I2C_NULL_HOP} } }
-#define CONFIG_KM_IVM_BUS 2 /* I2C2 (Mux-Port 1)*/
-
#if defined(CONFIG_CMD_NAND)
#define CONFIG_NAND_KMETER1
#define CONFIG_SYS_MAX_NAND_DEVICE 1
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index 74cd67456c..20b596f541 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -11,9 +11,6 @@
#define CONFIG_JFFS2_CMDLINE
-/* standard km ethernet_present for piggy */
-#define CONFIG_KM_COMMON_ETH_INIT 1
-
/* EEprom support 24C08, 24C16, 24C64 */
#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 /* 8 Byte write page */
@@ -45,20 +42,10 @@
/* size of rootfs in RAM */
#define CONFIG_KM_ROOTFSSIZE 0x0
-/* pseudo-non volatile RAM [hex] */
-#define CONFIG_KM_PNVRAM 0x80000
-/* physical RAM MTD size [hex] */
-#define CONFIG_KM_PHRAM 0x100000
-/* resereved pram area at the end of memroy [hex] */
-#define CONFIG_KM_RESERVED_PRAM 0x0
/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
* is not valid yet, which is the case for when u-boot copies itself to RAM */
#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
-#define CONFIG_KM_CRAMFS_ADDR 0xC00000
-#define CONFIG_KM_KERNEL_ADDR 0x400000 /* 7680Kbytes */
-#define CONFIG_KM_FDT_ADDR 0xB80000 /* 512Kbytes */
-
/* architecture specific default bootargs */
#define CONFIG_KM_DEF_BOOT_ARGS_CPU ""
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 6faff0fdb3..22bd744660 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -43,15 +43,6 @@
#define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
-/* pseudo-non volatile RAM [hex] */
-#define CONFIG_KM_PNVRAM 0x80000
-/* physical RAM MTD size [hex] */
-#define CONFIG_KM_PHRAM 0x17F000
-
-#define CONFIG_KM_CRAMFS_ADDR 0x2400000
-#define CONFIG_KM_KERNEL_ADDR 0x2000000 /* 3098KBytes */
-#define CONFIG_KM_FDT_ADDR 0x23E0000 /* 128KBytes */
-
/* architecture specific default bootargs */
#define CONFIG_KM_DEF_BOOT_ARGS_CPU \
"bootcountaddr=${bootcountaddr} ${mtdparts}" \
@@ -103,13 +94,6 @@
#define BOOTFLASH_START 0x0
-/* Kirkwood has two serial IF */
-#if (CONFIG_CONS_INDEX == 2)
-#define CONFIG_KM_CONSOLE_TTY "ttyS1"
-#else
-#define CONFIG_KM_CONSOLE_TTY "ttyS0"
-#endif
-
/*
* Other required minimal configurations
*/
@@ -124,7 +108,6 @@
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */
-#define CONFIG_KM_COMMON_ETH_INIT 1 /* standard km ethernet_present for piggy */
/*
* I2C related stuff
@@ -246,11 +229,6 @@ int get_scl(void);
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/* Do early setups now in board_init_f() */
-/*
- * resereved pram area at the end of memroy [hex]
- * 8Mbytes for switch + 4Kbytes for bootcount
- */
-#define CONFIG_KM_RESERVED_PRAM 0x801000
/* address for the bootcount (taken from end of RAM) */
#define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM)
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 3eff38017f..421a03e580 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -113,21 +113,10 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/* size of rootfs in RAM */
#define CONFIG_KM_ROOTFSSIZE 0x0
-/* pseudo-non volatile RAM [hex] */
-#define CONFIG_KM_PNVRAM 0x80000
-/* physical RAM MTD size [hex] */
-#define CONFIG_KM_PHRAM 0x100000
-/* reserved pram area at the end of memory [hex]
- * u-boot reserves some memory for the MP boot page */
-#define CONFIG_KM_RESERVED_PRAM 0x1000
/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
* is not valid yet, which is the case for when u-boot copies itself to RAM */
#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
-#define CONFIG_KM_CRAMFS_ADDR 0x2000000
-#define CONFIG_KM_KERNEL_ADDR 0x1000000 /* max kernel size 15.5Mbytes */
-#define CONFIG_KM_FDT_ADDR 0x1F80000 /* max dtb size 0.5Mbytes */
-
/*
* Local Bus Definitions
*/
@@ -217,8 +206,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
#define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
-#define CONFIG_KM_CONSOLE_TTY "ttyS0"
-
/* I2C */
#define CONFIG_SYS_I2C
@@ -243,8 +230,6 @@ int get_sda(void);
int get_scl(void);
#endif
-#define CONFIG_KM_IVM_BUS 1 /* I2C1 (Mux-Port 1)*/
-
/*
* eSPI - Enhanced SPI
*/