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>

diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index 859d913..42b760d 100644 (file)
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -120,10 +120,6 @@ struct bfticu_iomap {
        u8      pb_dbug;
 };
 
-#if !defined(CONFIG_PIGGY_MAC_ADRESS_OFFSET)
-#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 0
-#endif
-
 int ethernet_present(void);
 int ivm_read_eeprom(unsigned char *buf, int len);
 int ivm_analyze_eeprom(unsigned char *buf, int len);

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index a83782e..3106ef1 100644 (file)
--- 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 455e523..c06143c 100644 (file)
--- 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 74cd674..20b596f 100644 (file)
--- 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 6faff0f..22bd744 100644 (file)
--- 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 3eff380..421a03e 100644 (file)
--- 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
  */

diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index d032457..b679701 100644 (file)
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -24,13 +24,10 @@
 #if defined(CONFIG_KM_KIRKWOOD)
 #define CONFIG_HOSTNAME                        "km_kirkwood"
 #define CONFIG_KM_DISABLE_PCIE
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 
 /* KM_KIRKWOOD_PCI */
 #elif defined(CONFIG_KM_KIRKWOOD_PCI)
 #define CONFIG_HOSTNAME                        "km_kirkwood_pci"
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
-#define CONFIG_KM_FPGA_CONFIG 1
 #define CONFIG_KM_UBI_PART_BOOT_OPTS           ",2048"
 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 
@@ -40,11 +37,9 @@
 #undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
 #define CONFIG_KM_DISABLE_PCIE
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 
 /* KM_NUSA / KM_SUGP1 */
 #elif defined(CONFIG_KM_NUSA) || defined(CONFIG_KM_SUGP1)
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 
 # if defined(CONFIG_KM_NUSA)
 #define CONFIG_HOSTNAME                        "kmnusa"
@@ -55,48 +50,31 @@
 
 #undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
-#define CONFIG_KM_ENV_IS_IN_SPI_NOR 1
-#define CONFIG_KM_FPGA_CONFIG 1
-#define CONFIG_KM_PIGGY4_88E6352 1
-#define CONFIG_MV88E6352_SWITCH 1
-#define CONFIG_KM_MVEXTSW_ADDR         0x10
 
 /* KM_MGCOGE3UN */
 #elif defined(CONFIG_KM_MGCOGE3UN)
 #define CONFIG_HOSTNAME                        "mgcoge3un"
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 #undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
 #define CONFIG_KM_BOARD_EXTRA_ENV      "waitforne=true\0"
-#define CONFIG_PIGGY_MAC_ADRESS_OFFSET  3
 #define CONFIG_KM_DISABLE_PCIE
-#define CONFIG_KM_PIGGY4_88E6061 1
 
 /* KMCOGE5UN */
 #elif defined(CONFIG_KM_COGE5UN)
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 #undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_256M8_1.cfg
-#define CONFIG_KM_ENV_IS_IN_SPI_NOR 1
-#define CONFIG_PIGGY_MAC_ADRESS_OFFSET 3
 #define CONFIG_HOSTNAME                        "kmcoge5un"
 #define CONFIG_KM_DISABLE_PCIE
-#define CONFIG_KM_PIGGY4_88E6352 1
 
 /* KM_PORTL2 */
 #elif defined(CONFIG_KM_PORTL2)
 #define CONFIG_HOSTNAME                        "portl2"
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
-#define CONFIG_KM_PIGGY4_88E6061 1
 
 /* KM_SUV31 */
 #elif defined(CONFIG_KM_SUV31)
-#define CONFIG_KM_IVM_BUS              1       /* I2C2 (Mux-Port 1)*/
 #define CONFIG_HOSTNAME                        "kmsuv31"
 #undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
-#define CONFIG_KM_ENV_IS_IN_SPI_NOR 1
-#define CONFIG_KM_FPGA_CONFIG 1
 #define CONFIG_KM_UBI_PART_BOOT_OPTS           ",2048"
 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 #else

diff --git a/include/configs/kmvect1.h b/include/configs/kmvect1.h
index 3049521..4a3064d 100644 (file)
--- a/include/configs/kmvect1.h
+++ b/include/configs/kmvect1.h
@@ -34,11 +34,6 @@
 #define CONFIG_SYS_MAMR        (MxMR_GPL_x4DIS | \
                         0x0000c000 | \
                         MxMR_WLFx_2X)
-/*
- * QE UEC ethernet configuration
- */
-#define CONFIG_MV88E6352_SWITCH 1
-#define CONFIG_KM_MVEXTSW_ADDR         0x10
 
 /* ethernet port connected to simple switch 88e6122 (UEC0) */
 #define CONFIG_UEC_ETH1

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 53db749..8c5c5dd 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -954,9 +954,6 @@ CONFIG_KMVECT1
 CONFIG_KM_BOARD_EXTRA_ENV
 CONFIG_KM_BOARD_NAME
 CONFIG_KM_COGE5UN
-CONFIG_KM_COMMON_ETH_INIT
-CONFIG_KM_CONSOLE_TTY
-CONFIG_KM_CRAMFS_ADDR
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
@@ -971,24 +968,13 @@ CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_DISABLE_PCI
 CONFIG_KM_DISABLE_PCIE
 CONFIG_KM_ECC_MODE
-CONFIG_KM_ENV_IS_IN_SPI_NOR
-CONFIG_KM_FDT_ADDR
-CONFIG_KM_FPGA_CONFIG
-CONFIG_KM_IVM_BUS
-CONFIG_KM_KERNEL_ADDR
 CONFIG_KM_KIRKWOOD
 CONFIG_KM_KIRKWOOD_128M16
 CONFIG_KM_KIRKWOOD_PCI
 CONFIG_KM_MGCOGE3UN
-CONFIG_KM_MVEXTSW_ADDR
 CONFIG_KM_NEW_ENV
 CONFIG_KM_NUSA
-CONFIG_KM_PHRAM
-CONFIG_KM_PIGGY4_88E6061
-CONFIG_KM_PIGGY4_88E6352
-CONFIG_KM_PNVRAM
 CONFIG_KM_PORTL2
-CONFIG_KM_RESERVED_PRAM
 CONFIG_KM_ROOTFSSIZE
 CONFIG_KM_SUGP1
 CONFIG_KM_SUV31
@@ -1379,7 +1365,6 @@ CONFIG_PHY_M88E1111
 CONFIG_PHY_MODE_NEED_CHANGE
 CONFIG_PHY_RESET
 CONFIG_PHY_RESET_DELAY
-CONFIG_PIGGY_MAC_ADRESS_OFFSET
 CONFIG_PIXIS_BRDCFG0_SPI
 CONFIG_PIXIS_BRDCFG0_USB2
 CONFIG_PIXIS_BRDCFG1_AUDCLK_11
@@ -3042,9 +3027,6 @@ CONFIG_SYS_ISA_IO_BASE_ADDRESS
 CONFIG_SYS_ISA_IO_OFFSET
 CONFIG_SYS_ISA_IO_STRIDE
 CONFIG_SYS_ISA_MEM
-CONFIG_SYS_IVM_EEPROM_ADR
-CONFIG_SYS_IVM_EEPROM_MAX_LEN
-CONFIG_SYS_IVM_EEPROM_PAGE_LEN
 CONFIG_SYS_JFFS2_FIRST_BANK
 CONFIG_SYS_JFFS2_FIRST_SECTOR
 CONFIG_SYS_JFFS2_MEM_NAND