defconfigs files should be generated and they should not contain additional comments because they can be lost. Force the rule dropping the commnts inside the GE boards.
Signed-off-by: Stefano Babic sbabic@denx.de CC: Denis Zalevskiy denis.zalevskiy@ge.com Reported-by: Tom Rini trini@konsulko.com --- configs/ge_bx50v3_defconfig | 31 ++++++++----------------------- configs/mx53ppd_defconfig | 33 ++++++++------------------------- 2 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 6a052e00a1..4e54efb5e0 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_SYS_VPD_EEPROM_I2C_ADDR=0x50 +CONFIG_SYS_VPD_EEPROM_I2C_BUS=4 +CONFIG_SYS_VPD_EEPROM_SIZE=1024 CONFIG_TARGET_GE_BX50V3=y CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set @@ -8,29 +11,6 @@ CONFIG_FIT=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y - -# monitor's EEPROM is connected to the bus through the mux channel 1 -# (the number is the offset in CONFIG_SYS_I2C_BUSES) -CONFIG_SYS_VPD_EEPROM_I2C_BUS=4 -# Address of Atmel 24C08 EEPROM -CONFIG_SYS_VPD_EEPROM_I2C_ADDR=0x50 -CONFIG_SYS_VPD_EEPROM_I2C_ADDR_LEN=1 -CONFIG_SYS_VPD_EEPROM_SIZE=1024 - -CONFIG_BOOTCOUNT_I2C=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_BOOTCOUNT_I2C_BUS=4 -# bootcount is stored in VPD EEPROM -# we are using generic driver instead of EEPROM one (while should use it) -# at the end of VPD EEPROM: (SYS_VPD_EEPROM_SIZE - CONFIG_BOOTCOUNT_I2C_LEN) -# so, the address is 0x3FE: -# ("VPD EEPROM chip address" | "3rd 256-byte page"): -CONFIG_SYS_BOOTCOUNT_I2C_ADDR=0x53 -# (+ "offset in the page"): -CONFIG_SYS_BOOTCOUNT_ADDR=0xfe -CONFIG_BOOTCOUNT_I2C_LEN=2 -CONFIG_BOOTCOUNT_ALEN=1 - CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_LAST_STAGE_INIT=y @@ -50,7 +30,12 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_I2C=y CONFIG_BOOTCOUNT_BOOTLIMIT=10 +CONFIG_SYS_BOOTCOUNT_ADDR=0xfe +CONFIG_SYS_BOOTCOUNT_I2C_BUS=4 +CONFIG_SYS_BOOTCOUNT_I2C_ADDR=0x53 CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 3470faa156..b5d7e943c5 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -2,6 +2,9 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y CONFIG_SYS_TEXT_BASE=0x77800000 CONFIG_TARGET_MX53PPD=y +CONFIG_SYS_VPD_EEPROM_I2C_ADDR=0x50 +CONFIG_SYS_VPD_EEPROM_I2C_BUS=2 +CONFIG_SYS_VPD_EEPROM_SIZE=1024 CONFIG_NR_DRAM_BANKS=2 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ge/mx53ppd/imximage.cfg" @@ -9,31 +12,6 @@ CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y - -# monitor's EEPROM is connected to the bus through the mux channel 1 -# (the number is the offset in CONFIG_SYS_I2C_BUSES) -# (there is also Frame EEPROM connected to the channel 4 (bus 4)) -CONFIG_SYS_VPD_EEPROM_I2C_BUS=2 -# Address of Atmel 24C08 EEPROM -CONFIG_SYS_VPD_EEPROM_I2C_ADDR=0x50 -CONFIG_SYS_VPD_EEPROM_I2C_ADDR_LEN=1 -CONFIG_SYS_VPD_EEPROM_SIZE=1024 - -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_BOOTCOUNT_I2C=y -# using bus where monitor's EEPROM is connected to -CONFIG_SYS_BOOTCOUNT_I2C_BUS=2 -# bootcount is stored in Monitor's VPD EEPROM -# we are using generic driver instead of EEPROM one (while should use it) -# at the end of VPD EEPROM: (SYS_VPD_EEPROM_SIZE - CONFIG_BOOTCOUNT_I2C_LEN) -# so, the address is 0x3FE: -# ("VPD EEPROM chip address" | "3rd 256-byte page"): -CONFIG_SYS_BOOTCOUNT_I2C_ADDR=0x53 -# (+ "offset in the page"): -CONFIG_SYS_BOOTCOUNT_ADDR=0xfe -CONFIG_BOOTCOUNT_I2C_LEN=2 -CONFIG_BOOTCOUNT_ALEN=1 - CONFIG_SUPPORT_RAW_INITRD=y CONFIG_MISC_INIT_R=y CONFIG_HUSH_PARSER=y @@ -50,7 +28,12 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_I2C=y CONFIG_BOOTCOUNT_BOOTLIMIT=10 +CONFIG_SYS_BOOTCOUNT_ADDR=0xfe +CONFIG_SYS_BOOTCOUNT_I2C_BUS=2 +CONFIG_SYS_BOOTCOUNT_I2C_ADDR=0x53 CONFIG_FSL_ESDHC=y CONFIG_MII=y CONFIG_RTC_S35392A=y