db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP
Subsystems (13)
PATCH 1/11 db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP
The value CONFIG_DB_784MP_GP is only used in the DDR code to refer to CONFIG_TARGET_DB_MV784MP_GP so just use that second value directly.
--- arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- drivers/ddr/marvell/axp/ddr3_axp.h | 2 +- drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- include/configs/db-mv784mp-gp.h | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +1 -1
@@ -62,7 +62,7 @@ static u32 board_id_get(void)return DB_78X60_AMC_ID ;#elif defined(CONFIG_DB_78X60_PCAC_REV2 )return DB_78X60_PCAC_REV2_ID ; -#elif defined(CONFIG_DB_784MP_GP ) +#elif defined(CONFIG_TARGET_DB_MV784MP_GP )return DB_784MP_GP_ID ;#elif defined(CONFIG_RD_78460_CUSTOMER )return RD_78460_CUSTOMER_ID ;
drivers/ddr/marvell/axp/ddr3_axp.h +1 -1
@@ -37,7 +37,7 @@#define ECC_SUPPORT #endif #define NEW_FABRIC_TWSI_ADDR 0x4E -#ifdef CONFIG_DB_784MP_GP +#ifdef CONFIG_TARGET_DB_MV784MP_GP #define BUS_WIDTH_ECC_TWSI_ADDR 0x4E#else #define BUS_WIDTH_ECC_TWSI_ADDR 0x4F
drivers/ddr/marvell/axp/ddr3_axp_config.h +1 -1
@@ -138,7 +138,7 @@* Enables I2C auto detection different options */ #if defined(CONFIG_DB_88F78X60 ) || defined(CONFIG_DB_88F78X60_REV2 ) || \ - defined(CONFIG_DB_784MP_GP ) + defined(CONFIG_TARGET_DB_MV784MP_GP )#define AUTO_DETECTION_SUPPORT #endif #endif
include/configs/db-mv784mp-gp.h +0 -5
@@ -6,11 +6,6 @@#ifndef _CONFIG_DB_MV7846MP_GP_H#define _CONFIG_DB_MV7846MP_GP_H -/* -* High Level Configuration Options (easy to change) -*/ -#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ -/* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main
Signature · 1 line
2.25.1
PATCH 2/11 M5329EVB, M5373EVB: Remove CONFIG_NANDFLASH_SIZE
In the case of M5373EVB we always had NANDFLASH_SIZE=16, so just use it directly. In the case of M5329EVB we had not removed the rest of NAND support when saying we didn't have NAND, so instead use that to key off of rather than NANDFLASH_SIZE.
--- configs/M5329AFEE_defconfig | 3 --- configs/M5329BFEE_defconfig | 1 - configs/M5373EVB_defconfig | 1 - include/configs/M5329EVB.h | 6 +++--- include/configs/M5373EVB.h | 6 +----- 5 files changed, 4 insertions(+), 13 deletions(-)
configs/M5329AFEE_defconfig +0 -3
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE" CONFIG_TARGET_M5329EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 -CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
@@ -15,7 +14,6 @@ CONFIG_BOOTDELAY=1 CONFIG_SYS_PROMPT="-> " CONFIG_CMD_IMLS=y CONFIG_CMD_I2C=y -CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_MII_INIT=y
@@ -37,7 +35,6 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y -CONFIG_MTD_RAW_NAND=y CONFIG_DM_ETH=y CONFIG_MCFFEC=y CONFIG_MII=y
configs/M5329BFEE_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE" CONFIG_TARGET_M5329EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 -CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5373EVB_defconfig +0 -1
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5373EVB" CONFIG_TARGET_M5373EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 -CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
include/configs/M5329EVB.h +3 -3
@@ -113,7 +113,7 @@# define CONFIG_SYS_MAX_FLASH_SECT 137/* max number of sectors on one chip */ #endif -#ifdef CONFIG_NANDFLASH_SIZE +#ifdef CONFIG_CMD_NAND # define CONFIG_SYS_MAX_NAND_DEVICE 1# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE# define CONFIG_SYS_NAND_SIZE 1
@@ -165,9 +165,9 @@#define CONFIG_SYS_CS1_MASK 0x001f0001#define CONFIG_SYS_CS1_CTRL 0x002A3780 -#ifdef CONFIG_NANDFLASH_SIZE +#ifdef CONFIG_CMD_NAND #define CONFIG_SYS_CS2_BASE 0x20000000 -#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1) +#define CONFIG_SYS_CS2_MASK (16 << 20)#define CONFIG_SYS_CS2_CTRL 0x00001f60#endif
include/configs/M5373EVB.h +1 -5
@@ -115,13 +115,11 @@# define CONFIG_SYS_MAX_FLASH_SECT 137/* max number of sectors on one chip */ #endif -#ifdef CONFIG_NANDFLASH_SIZE # define CONFIG_SYS_MAX_NAND_DEVICE 1# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE# define CONFIG_SYS_NAND_SIZE 1# define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }# define NAND_ALLOW_ERASE_ALL 1 -#endif #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
@@ -167,10 +165,8 @@#define CONFIG_SYS_CS1_MASK 0x001f0001#define CONFIG_SYS_CS1_CTRL 0x002A3780 -#ifdef CONFIG_NANDFLASH_SIZE #define CONFIG_SYS_CS2_BASE 0x20000000 -#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1) +#define CONFIG_SYS_CS2_MASK (16 << 20)#define CONFIG_SYS_CS2_CTRL 0x00001f60 -#endif #endif /* _M5373EVB_H */
Signature · 1 line
2.25.1
PATCH 3/11 Convert CONFIG_DEEP_SLEEP to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_DEEP_SLEEP
--- README | 4 ---- board/freescale/common/Kconfig | 7 +++++++ configs/ls1021aiot_qspi_defconfig | 1 + configs/ls1021aiot_sdcard_defconfig | 1 + include/configs/T102xRDB.h | 5 ----- include/configs/T104xRDB.h | 3 --- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atsn.h | 2 -- include/configs/ls1021atwr.h | 2 -- 9 files changed, 9 insertions(+), 18 deletions(-)
README +0 -4
@@ -403,10 +403,6 @@ The following options need to be configured: This CONFIG is defined when the CPC is configured as SRAM at the time of U-Boot entry and is required to be re-initialized. - CONFIG_DEEP_SLEEP - Indicates this SoC supports deep sleep feature. If deep sleep is - supported, core will start to execute uboot when wakes up. - - Generic CPU options: CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN
board/freescale/common/Kconfig +7 -0
@@ -22,6 +22,13 @@ config CMD_ESBC_VALIDATE esbc_validate - validate signature using RSA verification esbc_halt - put the core in spin loop (Secure Boot Only) +config DEEP_SLEEP + bool "Enable SoC deep sleep feature" + default y if ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A + help + Indicates this SoC supports deep sleep feature. If deep sleep is + supported, core will start to execute uboot when wakes up. + config FSL_USE_PCA9547_MUX bool "Enable PCA9547 I2C Mux on Freescale boards" help
configs/ls1021aiot_qspi_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" +# CONFIG_DEEP_SLEEP is not set CONFIG_AHCI=y CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_OF_BOARD_SETUP=y
configs/ls1021aiot_sdcard_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart" CONFIG_SPL_TEXT_BASE=0x10000000 +# CONFIG_DEEP_SLEEP is not set CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y CONFIG_SPL=y
include/configs/T102xRDB.h +0 -5
@@ -20,11 +20,6 @@#define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */ #define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS -/* support deep sleep */ -#ifdef CONFIG_ARCH_T1024 -#define CONFIG_DEEP_SLEEP -#endif -#ifdef CONFIG_RAMBOOT_PBL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_PAD_TO 0x40000
include/configs/T104xRDB.h +0 -3
@@ -70,9 +70,6 @@/* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ -/* support deep sleep */ -#define CONFIG_DEEP_SLEEP -#ifndef CONFIG_RESET_VECTOR_ADDRESS #define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif
include/configs/ls1021aqds.h +0 -2
@@ -7,8 +7,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_DEEP_SLEEP -#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
include/configs/ls1021atsn.h +0 -2
@@ -6,8 +6,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_DEEP_SLEEP -#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
include/configs/ls1021atwr.h +0 -2
@@ -7,8 +7,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_DEEP_SLEEP -#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE
Signature · 1 line
2.25.1
PATCH 4/11 exynos: Drop CONFIG_DEVICE_TREE_LIST
In reply to Tom RiniThis value isn't used anywhere, drop it.
--- include/configs/exynos5420-common.h | 3 --- include/configs/exynos7420-common.h | 3 --- include/configs/exynos78x0-common.h | 3 --- 3 files changed, 9 deletions(-)
include/configs/exynos5420-common.h +0 -3
@@ -18,9 +18,6 @@#define CONFIG_SPL_MAX_FOOTPRINT (30 * 1024) -#define CONFIG_DEVICE_TREE_LIST "exynos5800-peach-pi" \ - "exynos5420-peach-pit exynos5420-smdk5420" -#define CONFIG_PHY_IRAM_BASE 0x02020000/* Address for relocating helper code (Last 4 KB of IRAM) */
include/configs/exynos7420-common.h +0 -3
@@ -27,9 +27,6 @@/* Timer input clock frequency */ #define COUNTER_FREQUENCY 24000000 -/* Device Tree */ -#define CONFIG_DEVICE_TREE_LIST "exynos7420-espresso7420" -/* IRAM Layout */ #define CONFIG_IRAM_BASE 0x02100000#define CONFIG_IRAM_SIZE 0x58000
include/configs/exynos78x0-common.h +0 -3
@@ -28,9 +28,6 @@/* Timer input clock frequency */ #define COUNTER_FREQUENCY 26000000 -/* Device Tree */ -#define CONFIG_DEVICE_TREE_LIST "EXYNOS78x0-a5y17lte" -#define CPU_RELEASE_ADDR secondary_boot_addr#define CONFIG_SYS_BAUDRATE_TABLE \
Signature · 1 line
2.25.1
Re: [PATCH 04/11] exynos: Drop CONFIG_DEVICE_TREE_LIST
Quoted 3 lines · Tom Rini
This value isn't used anywhere, drop it.
Signed-off-by Tom Rini <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 48 lines
--- include/configs/exynos5420-common.h | 3 --- include/configs/exynos7420-common.h | 3 --- include/configs/exynos78x0-common.h | 3 --- 3 files changed, 9 deletions(-)include/configs/exynos5420-common.h +0
-3@@ -18,9 +18,6 @@#define CONFIG_SPL_MAX_FOOTPRINT (30 * 1024) -#define CONFIG_DEVICE_TREE_LIST "exynos5800-peach-pi" \ - "exynos5420-peach-pit exynos5420-smdk5420" -#define CONFIG_PHY_IRAM_BASE 0x02020000/* Address for relocating helper code (Last 4 KB of IRAM) */ include/configs/exynos7420-common.h +0
-3@@ -27,9 +27,6 @@/* Timer input clock frequency */ #define COUNTER_FREQUENCY 24000000 -/* Device Tree */ -#define CONFIG_DEVICE_TREE_LIST "exynos7420-espresso7420" -/* IRAM Layout */ #define CONFIG_IRAM_BASE 0x02100000#define CONFIG_IRAM_SIZE 0x58000include/configs/exynos78x0-common.h +0
-3@@ -28,9 +28,6 @@/* Timer input clock frequency */ #define COUNTER_FREQUENCY 26000000 -/* Device Tree */ -#define CONFIG_DEVICE_TREE_LIST "EXYNOS78x0-a5y17lte" -#define CPU_RELEASE_ADDR secondary_boot_addr#define CONFIG_SYS_BAUDRATE_TABLE \
Minkyu Kang
Reviewed-byRe: [PATCH 04/11] exynos: Drop CONFIG_DEVICE_TREE_LIST
Dear Tom,
Quoted 10 lines · Jaehoon Chung
Quoted 3 lines · Tom Rini
This value isn't used anywhere, drop it.
Signed-off-by Tom Rini <[email protected]>Reviewed-by Jaehoon Chung <[email protected]>
Signature · 2 lines
Thanks, Minkyu Kang.
PATCH 5/11 mx53loco: Convert CONFIG_DIALOG_POWER to Kconfig
In reply to Tom Rini--- board/freescale/mx53loco/Kconfig | 3 +++ include/configs/mx53loco.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)
board/freescale/mx53loco/Kconfig +3 -0
@@ -1,5 +1,8 @@ if TARGET_MX53LOCO +config DIALOG_POWER + def_bool y + config SYS_BOARD default "mx53loco"
include/configs/mx53loco.h +0 -1
@@ -23,7 +23,6 @@#define CONFIG_MXC_USB_FLAGS 0/* PMIC Controller */ -#define CONFIG_DIALOG_POWER #define CONFIG_POWER_FSL #define CONFIG_POWER_FSL_MC13892 #define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
Signature · 1 line
2.25.1
PATCH 6/11 Convert CONFIG_E300 et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_E300
CONFIG_E5500
--- arch/powerpc/cpu/mpc83xx/Kconfig | 3 +++ arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++ arch/powerpc/include/asm/config_mpc85xx.h | 2 -- include/configs/MPC837XERDB.h | 1 - include/configs/km/km-mpc8309.h | 1 - 5 files changed, 9 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc83xx/Kconfig +3 -0
@@ -1,6 +1,9 @@ menu "mpc83xx CPU" depends on MPC83xx +config E300 + def_bool y + config SYS_CPU default "mpc83xx"
arch/powerpc/cpu/mpc85xx/Kconfig +6 -0
@@ -653,6 +653,7 @@ config ARCH_T1024 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50
@@ -677,6 +678,7 @@ config ARCH_T1040 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50
@@ -701,6 +703,7 @@ config ARCH_T1042 bool select BACKSIDE_L2_CACHE select E500MC + select E5500 select FSL_LAW select SYS_CACHE_SHIFT_6 select SYS_FSL_DDR_VER_50
@@ -805,6 +808,9 @@ config E500MC help Enble PowerPC E500MC core +config E5500 + bool + config E6500 bool select BTB
arch/powerpc/include/asm/config_mpc85xx.h +0 -2
@@ -270,7 +270,6 @@#endif #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042) -#define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1#define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */
@@ -299,7 +298,6 @@#define CONFIG_SYS_FSL_SFP_VER_3_0 #elif defined(CONFIG_ARCH_T1024 ) -#define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1#define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */
include/configs/MPC837XERDB.h +0 -1
@@ -13,7 +13,6 @@/* * High Level Configuration Options */ -#define CONFIG_E300 1/* E300 family */ #define CONFIG_HWCONFIG
include/configs/km/km-mpc8309.h +0 -1
@@ -1,7 +1,6 @@/* * High Level Configuration Options */ -#define CONFIG_E300 1/* E300 family */ #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0"
Signature · 1 line
2.25.1
PATCH 7/11 Convert CONFIG_SRIO_PCIE_BOOT_SLAVE to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_SRIO_PCIE_BOOT_SLAVE
--- board/freescale/t208xqds/Kconfig | 3 +++ configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
board/freescale/t208xqds/Kconfig +3 -0
@@ -9,6 +9,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "T208xQDS" +config SRIO_PCIE_BOOT_SLAVE + bool "Boot as a SRIO PCIe slave device" + source "board/freescale/common/Kconfig" endif
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -1
@@ -10,12 +10,12 @@ CONFIG_VOL_MONITOR_IR36021_SET=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y +CONFIG_SRIO_PCIE_BOOT_SLAVE=y CONFIG_MP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE" CONFIG_DYNAMIC_SYS_CLK_FREQ=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
Signature · 1 line
2.25.1
PATCH 8/11 at91: Switch to SD_BOOT / CONFIG_NAND_BOOT
In reply to Tom RiniThe values CONFIG_SYS_USE_NANDFLASH and CONFIG_SYS_USE_MMC serve the same purpose as CONFIG_SD_BOOT / CONFIG_NAND_BOOT so migrate to using these switches instead as they're already in Kconfig.
---
Note that this is size neutral except on sama5d2_xplained_qspiflash where previously we had enabled but slightly incomplete FAT support in SPL.
--- configs/at91sam9260ek_nandflash_defconfig | 3 +-- configs/at91sam9261ek_nandflash_defconfig | 3 +-- configs/at91sam9263ek_nandflash_defconfig | 3 +-- configs/at91sam9g10ek_nandflash_defconfig | 3 +-- configs/at91sam9g20ek_2mmc_defconfig | 2 +- configs/at91sam9g20ek_2mmc_nandflash_defconfig | 3 +-- configs/at91sam9g20ek_nandflash_defconfig | 3 +-- configs/at91sam9rlek_mmc_defconfig | 2 +- configs/at91sam9rlek_nandflash_defconfig | 3 +-- configs/at91sam9xeek_nandflash_defconfig | 3 +-- configs/axm_defconfig | 2 +- configs/corvus_defconfig | 3 +-- configs/meesc_defconfig | 3 +-- configs/sama5d2_xplained_emmc_defconfig | 1 - configs/sama5d2_xplained_mmc_defconfig | 1 - configs/sama5d2_xplained_qspiflash_defconfig | 2 +- configs/smartweb_defconfig | 2 +- configs/taurus_defconfig | 2 +- include/configs/smartweb.h | 1 - include/configs/taurus.h | 1 - 20 files changed, 16 insertions(+), 30 deletions(-)
configs/at91sam9260ek_nandflash_defconfig +1 -2
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -46,7 +46,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9261ek_nandflash_defconfig +1 -2
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -47,7 +47,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_nandflash_defconfig +1 -2
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -49,7 +49,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g10ek_nandflash_defconfig +1 -2
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -47,7 +47,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_2mmc_defconfig +1 -1
@@ -19,7 +19,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" +CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -2
@@ -18,7 +18,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -48,7 +48,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_nandflash_defconfig +1 -2
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -46,7 +46,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9rlek_mmc_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" +CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait"
configs/at91sam9rlek_nandflash_defconfig +1 -2
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
@@ -46,7 +46,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y CONFIG_GENERIC_ATMEL_MCI=y CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9xeek_nandflash_defconfig +1 -2
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -46,7 +46,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y
configs/axm_defconfig +1 -1
@@ -30,6 +30,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flash_self"
@@ -71,7 +72,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
configs/corvus_defconfig +1 -2
@@ -22,7 +22,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x70000000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -64,7 +64,6 @@ CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y
configs/meesc_defconfig +1 -2
@@ -12,7 +12,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_SYS_LOAD_ADDR=0x20100000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y
@@ -36,7 +36,6 @@ CONFIG_CLK_AT91=y CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_DM_SPI_FLASH=y
configs/sama5d2_xplained_emmc_defconfig +0 -1
@@ -25,7 +25,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_xplained_mmc_defconfig +0 -1
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_xplained_qspiflash_defconfig +1 -1
@@ -26,8 +26,8 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_QSPI_BOOT=y +CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
configs/smartweb_defconfig +1 -1
@@ -24,6 +24,7 @@ CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
@@ -65,7 +66,6 @@ CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
configs/taurus_defconfig +1 -1
@@ -32,6 +32,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 +CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
@@ -77,7 +78,6 @@ CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 CONFIG_AT91_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y -CONFIG_MTD_RAW_NAND=y # CONFIG_SYS_NAND_USE_FLASH_BBT is not set CONFIG_NAND_ATMEL=y CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
include/configs/smartweb.h +0 -1
@@ -134,7 +134,6 @@#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN#define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) -#define CONFIG_SYS_USE_NANDFLASH 1#define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K
include/configs/taurus.h +0 -1
@@ -152,7 +152,6 @@#define CONFIG_SPL_BSS_MAX_SIZE (3 * SZ_512)#define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) -#define CONFIG_SYS_USE_NANDFLASH 1#define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SYS_NAND_U_BOOT_SIZE SZ_512K
Signature · 1 line
2.25.1
PATCH 9/11 Convert CONFIG_NORFLASH_PS32BIT to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_NORFLASH_PS32BIT
Note that we also attempt to correct the behavior of the code here, which had been testing for "NORFLASH_PS32BIT" which would never be set, instead check for the now set "CONFIG_NORFLASH_PS32BIT", which results in some behavior change.
--- board/freescale/m5235evb/Kconfig | 3 +++ configs/M5235EVB_Flash32_defconfig | 2 +- include/configs/M5235EVB.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)
board/freescale/m5235evb/Kconfig +3 -0
@@ -12,4 +12,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "M5235EVB" +config NORFLASH_PS32BIT + bool "Board has 32bit CFI flash" + endif
configs/M5235EVB_Flash32_defconfig +1 -1
@@ -5,9 +5,9 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DEFAULT_DEVICE_TREE="M5235EVB_Flash32" CONFIG_TARGET_M5235EVB=y +CONFIG_NORFLASH_PS32BIT=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 -CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT" CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
include/configs/M5235EVB.h +2 -2
@@ -105,7 +105,7 @@*/ #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_SYS_FLASH_SIZE 0x800000/* Max size that the board might have */ -#ifdef NORFLASH_PS32BIT +#ifdef CONFIG_NORFLASH_PS32BIT # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT#else # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
@@ -152,7 +152,7 @@* CS6 - Available * CS7 - Available */ -#ifdef NORFLASH_PS32BIT +#ifdef CONFIG_NORFLASH_PS32BIT # define CONFIG_SYS_CS0_BASE 0xFFC00000# define CONFIG_SYS_CS0_MASK 0x003f0001# define CONFIG_SYS_CS0_CTRL 0x00001D00
Signature · 1 line
2.25.1
PATCH 10/11 Convert CONFIG_SYS_MONITOR_BASE to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_SYS_MONITOR_BASE
Note that for how this is re-used on some PowePC platforms, we introduce CONFIG_SPL_SYS_MONITOR_BASE and CONFIG_TPL_SYS_MONITOR_BASE and use the CONFIG_VAL macro to get the correct value at build time, in the code.
--- README | 6 ---- arch/powerpc/cpu/mpc85xx/start.S | 34 +++++++++---------- boot/Kconfig | 25 ++++++++++++++ configs/10m50_defconfig | 1 + configs/3c120_defconfig | 1 + configs/M5208EVBE_defconfig | 1 + configs/M5235EVB_Flash32_defconfig | 1 + configs/M5235EVB_defconfig | 1 + configs/M5249EVB_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5272C3_defconfig | 1 + configs/M5275EVB_defconfig | 1 + configs/M5282EVB_defconfig | 1 + configs/M53017EVB_defconfig | 1 + configs/M5329AFEE_defconfig | 1 + configs/M5329BFEE_defconfig | 1 + configs/M5373EVB_defconfig | 1 + configs/MCR3000_defconfig | 1 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 + configs/P1010RDB-PA_NAND_defconfig | 1 + configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 + configs/P1010RDB-PB_NAND_defconfig | 1 + configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 + configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P1020RDB-PC_NAND_defconfig | 1 + configs/P1020RDB-PC_SDCARD_defconfig | 1 + configs/P1020RDB-PC_SPIFLASH_defconfig | 1 + configs/P1020RDB-PD_NAND_defconfig | 1 + configs/P1020RDB-PD_SDCARD_defconfig | 1 + configs/P1020RDB-PD_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 + configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 + configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 + configs/P2020RDB-PC_NAND_defconfig | 1 + configs/P2020RDB-PC_SDCARD_defconfig | 1 + configs/P2020RDB-PC_SPIFLASH_defconfig | 1 + configs/adp-ae3xx_defconfig | 1 + configs/adp-ag101p_defconfig | 1 + configs/ae350_rv32_defconfig | 1 + configs/ae350_rv32_spl_defconfig | 1 + configs/ae350_rv32_spl_xip_defconfig | 1 + configs/ae350_rv32_xip_defconfig | 1 + configs/ae350_rv64_defconfig | 1 + configs/ae350_rv64_spl_defconfig | 1 + configs/ae350_rv64_spl_xip_defconfig | 1 + configs/ae350_rv64_xip_defconfig | 1 + configs/amcore_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/at91sam9263ek_norflash_boot_defconfig | 1 + configs/at91sam9263ek_norflash_defconfig | 1 + configs/chromebook_coral_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/cobra5272_defconfig | 1 + configs/colibri_pxa270_defconfig | 1 + configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig | 1 + configs/eb_cpu5282_defconfig | 2 +- configs/eb_cpu5282_internal_defconfig | 2 +- configs/edison_defconfig | 1 + configs/integratorcp_cm1136_defconfig | 1 + configs/integratorcp_cm920t_defconfig | 1 + configs/integratorcp_cm926ejs_defconfig | 1 + configs/integratorcp_cm946es_defconfig | 1 + configs/kmcent2_defconfig | 1 + configs/omap35_logic_somlv_defconfig | 1 + configs/omap3_logic_somlv_defconfig | 1 + configs/qemu-ppce500_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/r2dplus_defconfig | 1 + configs/r8a77990_ebisu_defconfig | 1 + configs/r8a77995_draak_defconfig | 1 + configs/rcar3_salvator-x_defconfig | 1 + configs/rcar3_ulcb_defconfig | 1 + configs/socrates_defconfig | 1 + configs/stmark2_defconfig | 1 + configs/vexpress_ca9x4_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/configs/10m50_devboard.h | 3 -- include/configs/3c120_devboard.h | 3 -- include/configs/M5208EVBE.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5249EVB.h | 2 -- include/configs/M5253DEMO.h | 6 ---- include/configs/M5272C3.h | 6 ---- include/configs/M5275EVB.h | 6 ---- include/configs/M5282EVB.h | 8 ----- include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/MCR3000.h | 1 - include/configs/MPC837XERDB.h | 1 - include/configs/MPC8548CDS.h | 2 -- include/configs/P1010RDB.h | 8 ----- include/configs/P2041RDB.h | 2 -- include/configs/T102xRDB.h | 6 ---- include/configs/T104xRDB.h | 6 ---- include/configs/T208xQDS.h | 6 ---- include/configs/T208xRDB.h | 6 ---- include/configs/T4240RDB.h | 6 ---- include/configs/adp-ae3xx.h | 1 - include/configs/adp-ag101p.h | 1 - include/configs/am335x_evm.h | 1 - include/configs/am3517_evm.h | 3 -- include/configs/amcore.h | 1 - include/configs/ap121.h | 2 -- include/configs/ap143.h | 2 -- include/configs/ap152.h | 2 -- include/configs/armadillo-800eva.h | 1 - include/configs/astro_mcf5373l.h | 6 ---- include/configs/at91sam9263ek.h | 1 - include/configs/ax25-ae350.h | 1 - include/configs/axs10x.h | 1 - include/configs/bmips_common.h | 3 -- include/configs/boston.h | 2 -- include/configs/ci20.h | 2 -- include/configs/cobra5272.h | 6 ---- include/configs/colibri_pxa270.h | 1 - include/configs/corenet_ds.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/edison.h | 1 - include/configs/emsdp.h | 2 -- include/configs/exynos5-common.h | 2 -- .../configs/gardena-smart-gateway-mt7688.h | 3 -- include/configs/gazerbeam.h | 1 - include/configs/hsdk-4xd.h | 1 - include/configs/hsdk.h | 1 - include/configs/ids8313.h | 1 - include/configs/imgtec_xilfpga.h | 2 -- include/configs/imx27lite-common.h | 1 - include/configs/integratorcp.h | 22 ------------ include/configs/iot_devkit.h | 2 -- include/configs/km/km-mpc83xx.h | 1 - include/configs/km/pg-wcom-ls102xa.h | 1 - include/configs/kmcent2.h | 1 - include/configs/kzm9g.h | 1 - include/configs/linkit-smart-7688.h | 3 -- include/configs/ls1021aiot.h | 7 ---- include/configs/ls1021aqds.h | 6 ---- include/configs/ls1021atsn.h | 6 ---- include/configs/ls1021atwr.h | 6 ---- include/configs/ls1028a_common.h | 2 -- include/configs/ls1028aqds.h | 6 ---- include/configs/ls1028ardb.h | 2 -- include/configs/ls1043aqds.h | 6 ---- include/configs/ls1046aqds.h | 2 -- include/configs/ls1088aqds.h | 6 ---- include/configs/ls1088ardb.h | 6 ---- include/configs/malta.h | 1 - include/configs/mt7620.h | 2 -- include/configs/mt7628.h | 2 -- include/configs/nsim.h | 1 - include/configs/octeon_common.h | 1 - include/configs/odroid.h | 2 -- include/configs/omap3_logic.h | 3 -- include/configs/origen.h | 2 -- include/configs/p1_p2_rdb_pc.h | 10 ------ include/configs/pic32mzdask.h | 1 - include/configs/qemu-arm.h | 1 - include/configs/qemu-ppce500.h | 2 -- include/configs/r2dplus.h | 1 - include/configs/rcar-gen2-common.h | 1 - include/configs/rcar-gen3-common.h | 1 - include/configs/s5p4418_nanopi2.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 2 -- include/configs/sandbox.h | 1 - include/configs/smdkc100.h | 2 -- include/configs/socfpga_soc64_common.h | 1 - include/configs/socrates.h | 2 -- include/configs/stmark2.h | 6 ---- include/configs/tb100.h | 1 - include/configs/tplink_wdr4300.h | 2 -- include/configs/trats.h | 2 -- include/configs/trats2.h | 2 -- include/configs/uniphier.h | 1 - include/configs/vcoreiii.h | 2 -- include/configs/vexpress_common.h | 1 - include/configs/vocore2.h | 3 -- include/configs/x86-common.h | 1 - include/configs/xtfpga.h | 3 -- 182 files changed, 118 insertions(+), 314 deletions(-)
README +0 -6
@@ -1939,12 +1939,6 @@ Configuration Settings: - CONFIG_SYS_FLASH_BASE: Physical start address of Flash memory. -- CONFIG_SYS_MONITOR_BASE: - Physical start address of boot monitor code (set by - make config files to be same as the text base address - (CONFIG_SYS_TEXT_BASE) used when linking) - same as - CONFIG_SYS_FLASH_BASE when booting from flash. - - CONFIG_SYS_MONITOR_LEN: Size of memory reserved for monitor code, used to determine _at_compile_time_ (!) if the environment is
arch/powerpc/cpu/mpc85xx/start.S +17 -17
@@ -247,7 +247,7 @@ l2_disabled: /* Interrupt vectors do not fit in minimal SPL. */ #if !defined(MINIMAL_SPL) /* Setup interrupt vectors */ - lis r1,CONFIG_SYS_MONITOR_BASE@h + lis r1,CONFIG_VAL(SYS_MONITOR_BASE)@h mtspr IVPR,r1 li r4,CriticalInput@l
@@ -450,7 +450,7 @@ nexti: mflr r1 /* R1 = our PC */ */ create_tlb1_entry CONFIG_SYS_PPC_E500_DEBUG_TLB, \ 0, BOOKE_PAGESZ_4M, \ - CONFIG_SYS_MONITOR_BASE & 0xffc00000, MAS2_I|MAS2_G, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xffc00000, MAS2_I|MAS2_G, \ 0xffc00000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6
@@ -461,8 +461,8 @@ nexti: mflr r1 /* R1 = our PC */ */ create_tlb1_entry CONFIG_SYS_PPC_E500_DEBUG_TLB, \ 0, BOOKE_PAGESZ_256K, \ - CONFIG_SYS_MONITOR_BASE & 0xfffc0000, MAS2_I, \ - CONFIG_SYS_MONITOR_BASE & 0xfffc0000, MAS3_SX|MAS3_SW|MAS3_SR, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfffc0000, MAS2_I, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfffc0000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6 #endif #endif
@@ -1027,7 +1027,7 @@ create_init_ram_area: /* create a temp mapping in AS=1 to the 4M boot window */ create_tlb1_entry 15, \ 1, BOOKE_PAGESZ_4M, \ - CONFIG_SYS_MONITOR_BASE & 0xffc00000, MAS2_I|MAS2_G, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xffc00000, MAS2_I|MAS2_G, \ 0xffc00000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6
@@ -1037,7 +1037,7 @@ create_init_ram_area: */ create_tlb1_entry 15, \ 1, BOOKE_PAGESZ_1M, \ - CONFIG_SYS_MONITOR_BASE & 0xfff00000, MAS2_I|MAS2_G, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS2_I|MAS2_G, \ CONFIG_SYS_PBI_FLASH_WINDOW & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6
@@ -1048,24 +1048,24 @@ create_init_ram_area: */ #elif defined(CONFIG_RAMBOOT_PBL) && defined(CONFIG_NXP_ESBC) && \ (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) - /* create a temp mapping in AS = 1 for mapping CONFIG_SYS_MONITOR_BASE + /* create a temp mapping in AS = 1 for mapping CONFIG_VAL(SYS_MONITOR_BASE) * to L3 Address configured by PBL for ISBC code */ create_tlb1_entry 15, \ 1, BOOKE_PAGESZ_1M, \ - CONFIG_SYS_MONITOR_BASE & 0xfff00000, MAS2_I|MAS2_G, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS2_I|MAS2_G, \ CONFIG_SYS_INIT_L3_ADDR & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6 #else /* - * create a temp mapping in AS=1 to the 1M CONFIG_SYS_MONITOR_BASE space, the main - * image has been relocated to CONFIG_SYS_MONITOR_BASE on the second stage. + * create a temp mapping in AS=1 to the 1M CONFIG_VAL(SYS_MONITOR_BASE) space, the main + * image has been relocated to CONFIG_VAL(SYS_MONITOR_BASE) on the second stage. */ create_tlb1_entry 15, \ 1, BOOKE_PAGESZ_1M, \ - CONFIG_SYS_MONITOR_BASE & 0xfff00000, MAS2_I|MAS2_G, \ - CONFIG_SYS_MONITOR_BASE & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS2_I|MAS2_G, \ + CONFIG_VAL(SYS_MONITOR_BASE) & 0xfff00000, MAS3_SX|MAS3_SW|MAS3_SR, \ 0, r6 #endif
@@ -1126,8 +1126,8 @@ switch_as: #else /* Calculate absolute address in FLASH and jump there */ /*--------------------------------------------------------------*/ - lis r3,CONFIG_SYS_MONITOR_BASE@h - ori r3,r3,CONFIG_SYS_MONITOR_BASE@l + lis r3,CONFIG_VAL(SYS_MONITOR_BASE)@h + ori r3,r3,CONFIG_VAL(SYS_MONITOR_BASE)@l addi r3,r3,_start_cont - _start mtlr r3 blr
@@ -1530,8 +1530,8 @@ relocate_code: GET_GOT #ifndef CONFIG_SPL_SKIP_RELOCATE mr r3,r5 /* Destination Address */ - lis r4,CONFIG_SYS_MONITOR_BASE@h /* Source Address */ - ori r4,r4,CONFIG_SYS_MONITOR_BASE@l + lis r4,CONFIG_VAL(SYS_MONITOR_BASE)@h /* Source Address */ + ori r4,r4,CONFIG_VAL(SYS_MONITOR_BASE)@l lwz r5,GOT(__init_end) sub r5,r5,r4 li r6,CONFIG_SYS_CACHELINE_SIZE /* Cache Line Size */
@@ -1539,7 +1539,7 @@ relocate_code: /* * Fix GOT pointer: * - * New GOT-PTR = (old GOT-PTR - CONFIG_SYS_MONITOR_BASE) + Destination Address + * New GOT-PTR = (old GOT-PTR - CONFIG_VAL(SYS_MONITOR_BASE)) + Destination Address * * Offset: */
boot/Kconfig +25 -0
@@ -370,6 +370,31 @@ config SYS_TEXT_BASE help The address in memory that U-Boot will be running from, initially. +config HAVE_SYS_MONITOR_BASE + bool + depends on ARC || MIPS || M68K || NIOS2 || PPC || XTENSA || X86 \ + || FLASH_PIC32 || ENV_IS_IN_FLASH || MTD_NOR_FLASH + depends on !EFI_APP + default y + +config SYS_MONITOR_BASE + depends on HAVE_SYS_MONITOR_BASE + hex "Physical start address of boot monitor code" + default SYS_TEXT_BASE + help + The physical start address of boot monitor code (which is the same as + CONFIG_SYS_TEXT_BASE when linking) and the same as CONFIG_SYS_FLASH_BASE + when booting from flash. + +config SPL_SYS_MONITOR_BASE + depends on MPC85xx && SPL && HAVE_SYS_MONITOR_BASE + hex "Physical start address of SPL monitor code" + default SPL_TEXT_BASE + +config TPL_SYS_MONITOR_BASE + depends on MPC85xx && TPL && HAVE_SYS_MONITOR_BASE + hex "Physical start address of TPL monitor code" + config DYNAMIC_SYS_CLK_FREQ bool "Determine CPU clock frequency at run-time" help
configs/10m50_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_SYS_LOAD_ADDR=0xcc000000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0xCFF80000 # CONFIG_AUTOBOOT is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/3c120_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_SYS_LOAD_ADDR=0xd4000000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0xD7F80000 # CONFIG_AUTOBOOT is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/M5208EVBE_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5208EVBE" CONFIG_TARGET_M5208EVBE=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5235EVB_Flash32_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_TARGET_M5235EVB=y CONFIG_NORFLASH_PS32BIT=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFC00400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5235EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5235EVB" CONFIG_TARGET_M5235EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5249EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5249EVB" CONFIG_TARGET_M5249EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x200000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 # CONFIG_AUTOBOOT is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_DEVICE_NULLDEV=y
configs/M5253DEMO_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5253DEMO" CONFIG_TARGET_M5253DEMO=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x100000 +CONFIG_SYS_MONITOR_BASE=0xFF800400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5272C3_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5272C3" CONFIG_TARGET_M5272C3=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5275EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5275EVB" CONFIG_TARGET_M5275EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x800000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="bootm ffe40000"
configs/M5282EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5282EVB" CONFIG_TARGET_M5282EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M53017EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M53017EVB" CONFIG_TARGET_M53017EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock3 rw rootfstype=jffs2"
configs/M5329AFEE_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE" CONFIG_TARGET_M5329EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5329BFEE_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE" CONFIG_TARGET_M5329EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/M5373EVB_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="M5373EVB" CONFIG_TARGET_M5373EVB=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/MCR3000_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_SYS_SCCR_MASK=0x60000000 CONFIG_SYS_DER=0x2002000F CONFIG_SYS_LOAD_ADDR=0x200000 CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_MONITOR_BASE=0x04000000 CONFIG_BOOTDELAY=5 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="\nEnter password - autoboot in %d sec...\n"
configs/P1010RDB-PA_36BIT_NAND_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
configs/P1010RDB-PA_NAND_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
configs/P1010RDB-PB_36BIT_NAND_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
configs/P1010RDB-PB_NAND_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
configs/P1020RDB-PC_36BIT_NAND_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_SPIFLASH=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
configs/P1020RDB-PC_NAND_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PC_SDCARD_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PC_SPIFLASH_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_SPIFLASH=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
configs/P1020RDB-PD_NAND_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PD_SDCARD_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P1020RDB-PD_SPIFLASH_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_SPIFLASH=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
configs/P2020RDB-PC_36BIT_NAND_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_SPIFLASH=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
configs/P2020RDB-PC_NAND_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2020RDB-PC_SDCARD_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
configs/P2020RDB-PC_SPIFLASH_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 CONFIG_SPIFLASH=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTCOMMAND=y
configs/adp-ae3xx_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_SYS_CLK_FREQ=39062500 CONFIG_TARGET_ADP_AE3XX=y CONFIG_SYS_LOAD_ADDR=0x300000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="NDS32 # "
configs/adp-ag101p_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_CLK_FREQ=39062500 CONFIG_TARGET_ADP_AG101P=y CONFIG_SYS_LOAD_ADDR=0x300000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x80000000 CONFIG_BOOTDELAY=3 # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="NDS32 # "
configs/ae350_rv32_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_TARGET_AX25_AE350=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv32_spl_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv32_spl_xip_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv32_xip_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv64_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_ARCH_RV64I=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv64_spl_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x00200000 +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv64_spl_xip_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/ae350_rv64_xip_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_XIP=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x100000 CONFIG_FIT=y +CONFIG_SYS_MONITOR_BASE=0x88000000 CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="RISC-V # "
configs/amcore_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="amcore" CONFIG_TARGET_AMCORE=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFC00400 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="bootm ffc20000"
configs/armadillo-800eva_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_SYS_CLK_FREQ=50000000 CONFIG_SYS_LOAD_ADDR=0x44000000 +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_BOOTDELAY=3 # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set
configs/astro_mcf5373l_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="astro_mcf5373l" CONFIG_TARGET_ASTRO_MCF5373L=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0x00000400 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS=" console=ttyS2,115200 rootfstype=romfs loaderversion=$loaderversion"
configs/at91sam9263ek_norflash_boot_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 +CONFIG_SYS_MONITOR_BASE=0x10000000 CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/at91sam9263ek_norflash_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 +CONFIG_SYS_MONITOR_BASE=0x10000000 CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/chromebook_coral_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_X86_OFFSET_U_BOOT=0xffd00000 CONFIG_X86_OFFSET_SPL=0xffe80000 CONFIG_INTEL_ACPIGEN=y CONFIG_INTEL_GENERIC_WIFI=y +CONFIG_SYS_MONITOR_BASE=0x01110000 CONFIG_CHROMEOS=y CONFIG_BOOTSTAGE=y CONFIG_SPL_BOOTSTAGE=y
configs/chromebook_samus_tpl_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_HAVE_REFCODE=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y CONFIG_X86_OFFSET_U_BOOT=0xffee0000 +CONFIG_SYS_MONITOR_BASE=0xFFED0000 CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SHOW_BOOT_PROGRESS=y
configs/cobra5272_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="cobra5272" CONFIG_TARGET_COBRA5272=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 +CONFIG_SYS_MONITOR_BASE=0xFFE00400 CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMDLINE_EDITING is not set
configs/colibri_pxa270_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0xa0000000 CONFIG_TIMESTAMP=y +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200" CONFIG_USE_BOOTCOMMAND=y
configs/coreboot64_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_VENDOR_COREBOOT=y CONFIG_TARGET_COREBOOT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y +CONFIG_SYS_MONITOR_BASE=0x01120000 CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
configs/coreboot_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_VENDOR_COREBOOT=y CONFIG_TARGET_COREBOOT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y +CONFIG_SYS_MONITOR_BASE=0x01110000 CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
configs/eb_cpu5282_defconfig +1 -1
@@ -6,7 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282" CONFIG_TARGET_EB_CPU5282=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xFF000400" +CONFIG_SYS_MONITOR_BASE=0xFF000400 CONFIG_BOOTDELAY=5 CONFIG_BOOT_RETRY=y CONFIG_BOOT_RETRY_TIME=-1
configs/eb_cpu5282_internal_defconfig +1 -1
@@ -6,7 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="eb_cpu5282_internal" CONFIG_TARGET_EB_CPU5282=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x20000 -CONFIG_SYS_EXTRA_OPTIONS="SYS_MONITOR_BASE=0xF0000418" +CONFIG_SYS_MONITOR_BASE=0xF0000418 CONFIG_BOOTDELAY=5 CONFIG_BOOT_RETRY=y CONFIG_BOOT_RETRY_TIME=-1
configs/edison_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_VENDOR_INTEL=y CONFIG_TARGET_EDISON=y CONFIG_SMP=y CONFIG_SYS_LOAD_ADDR=0x100000 +CONFIG_SYS_MONITOR_BASE=0x01101000 CONFIG_BOARD_EARLY_INIT_R=y CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y
configs/integratorcp_cm1136_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SYS_LOAD_ADDR=0x7fc0 +CONFIG_SYS_MONITOR_BASE=0x27F40000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" CONFIG_USE_BOOTCOMMAND=y
configs/integratorcp_cm920t_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SYS_LOAD_ADDR=0x7fc0 +CONFIG_SYS_MONITOR_BASE=0x27F40000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" CONFIG_USE_BOOTCOMMAND=y
configs/integratorcp_cm926ejs_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SYS_LOAD_ADDR=0x7fc0 +CONFIG_SYS_MONITOR_BASE=0x27F40000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" CONFIG_USE_BOOTCOMMAND=y
configs/integratorcp_cm946es_defconfig +1 -0
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_SYS_LOAD_ADDR=0x7fc0 +CONFIG_SYS_MONITOR_BASE=0x27F40000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0" CONFIG_USE_BOOTCOMMAND=y
configs/kmcent2_defconfig +1 -0
@@ -16,6 +16,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SYS_MONITOR_BASE=0xEBF40000 CONFIG_EVENT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y
configs/omap35_logic_somlv_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_SPL=y CONFIG_LTO=y CONFIG_DISTRO_DEFAULTS=y CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_SYS_MONITOR_BASE=0x10000000 CONFIG_BOOTCOMMAND="run autoboot" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv preboot;saveenv;"
configs/omap3_logic_somlv_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_SPL=y CONFIG_LTO=y CONFIG_DISTRO_DEFAULTS=y CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_SYS_MONITOR_BASE=0x10000000 CONFIG_BOOTCOMMAND="run autoboot" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv preboot;saveenv;"
configs/qemu-ppce500_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_TARGET_QEMU_PPCE500=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SYS_MONITOR_BASE=0x00F01000 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr"
configs/qemu-x86_64_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set +CONFIG_SYS_MONITOR_BASE=0x01110000 CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SHOW_BOOT_PROGRESS=y
configs/r2dplus_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sh7751-r2dplus" CONFIG_SYS_CLK_FREQ=60000000 CONFIG_TARGET_R2DPLUS=y CONFIG_SYS_LOAD_ADDR=0x8e000000 +CONFIG_SYS_MONITOR_BASE=0xA0000000 CONFIG_BOOTDELAY=-1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttySC0,115200"
configs/r8a77990_ebisu_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_REMAKE_ELF=y CONFIG_SYS_LOAD_ADDR=0x58000000 CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77990-ebisu.dtb; booti 0x48080000 - 0x48000000"
configs/r8a77995_draak_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_REMAKE_ELF=y CONFIG_SYS_LOAD_ADDR=0x58000000 CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77995-draak.dtb; booti 0x48080000 - 0x48000000"
configs/rcar3_salvator-x_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_REMAKE_ELF=y CONFIG_SYS_LOAD_ADDR=0x58000000 CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-salvator-x.dtb; booti 0x48080000 - 0x48000000"
configs/rcar3_ulcb_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_REMAKE_ELF=y CONFIG_SYS_LOAD_ADDR=0x58000000 CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_SYS_MONITOR_BASE=0x00000000 CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-ulcb.dtb; booti 0x48080000 - 0x48000000"
configs/socrates_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_TARGET_SOCRATES=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_MONITOR_BASE=0xFFF80000 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run boot_nor"
configs/stmark2_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_TARGET_STMARK2=y CONFIG_MCFTMR=y CONFIG_SYS_LOAD_ADDR=0x40010000 CONFIG_TIMESTAMP=y +CONFIG_SYS_MONITOR_BASE=0x47E00400 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 rw rootfstype=ramfs rdinit=/bin/init devtmpfs.mount=1" CONFIG_USE_BOOTCOMMAND=y
configs/vexpress_ca9x4_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="vexpress-v2p-ca9" CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_LOAD_ADDR=0x90000000 +CONFIG_SYS_MONITOR_BASE=0x40000000 CONFIG_BOOTCOMMAND="run distro_bootcmd; run bootflash" CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb" # CONFIG_DISPLAY_CPUINFO is not set
configs/xtfpga_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_XTFPGA_KC705=y CONFIG_SYS_LOAD_ADDR=0x02000000 +CONFIG_SYS_MONITOR_BASE=0xF6000000 CONFIG_DYNAMIC_SYS_CLK_FREQ=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=10
include/configs/10m50_devboard.h +0 -3
@@ -36,8 +36,5 @@#define CONFIG_SYS_SDRAM_SIZE 0x08000000#define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_SYS_MONITOR_LEN 0x80000/* Reserve 512k */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ - CONFIG_SYS_SDRAM_SIZE - \ - CONFIG_SYS_MONITOR_LEN)#endif /* __CONFIG_H */
include/configs/3c120_devboard.h +0 -3
@@ -32,8 +32,5 @@#define CONFIG_SYS_SDRAM_SIZE 0x08000000#define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_SYS_MONITOR_LEN 0x80000/* Reserve 512k */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ - CONFIG_SYS_SDRAM_SIZE - \ - CONFIG_SYS_MONITOR_LEN)#endif /* __CONFIG_H */
include/configs/M5208EVBE.h +0 -1
@@ -81,7 +81,6 @@#define CONFIG_SYS_SDRAM_EMOD 0x80010000#define CONFIG_SYS_SDRAM_MODE 0x00CD0000 -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5235EVB.h +0 -1
@@ -86,7 +86,6 @@#define CONFIG_SYS_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_SIZE 16/* SDRAM size in MB */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5249EVB.h +0 -2
@@ -64,8 +64,6 @@#define CONFIG_PRAM 512/* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */ #endif -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#define CONFIG_SYS_MONITOR_LEN 0x20000#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5253DEMO.h +0 -6
@@ -91,12 +91,6 @@#define CONFIG_SYS_SDRAM_BASE 0x00000000#define CONFIG_SYS_SDRAM_SIZE 16/* SDRAM size in MB */ -#ifdef CONFIG_MONITOR_IS_IN_RAM -# define CONFIG_SYS_MONITOR_BASE 0x20000 -#else -# define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif -#define CONFIG_SYS_MONITOR_LEN 0x40000#define CONFIG_SYS_BOOTPARAMS_LEN (64*1024)
include/configs/M5272C3.h +0 -6
@@ -88,12 +88,6 @@#define CONFIG_SYS_SDRAM_SIZE 4/* SDRAM size in MB */ #define CONFIG_SYS_FLASH_BASE 0xffe00000 -#ifdef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_SYS_MONITOR_BASE 0x20000 -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif -#define CONFIG_SYS_MONITOR_LEN 0x20000#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5275EVB.h +0 -6
@@ -90,12 +90,6 @@#define CONFIG_SYS_SDRAM_SIZE 16/* SDRAM size in MB */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE -#ifdef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_SYS_MONITOR_BASE 0x20000 -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif -#define CONFIG_SYS_MONITOR_LEN 0x20000#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5282EVB.h +0 -8
@@ -91,14 +91,6 @@#define CONFIG_SYS_INT_FLASH_BASE 0xf0000000#define CONFIG_SYS_INT_FLASH_ENABLE 0x21 -/* If M5282 port is fully implemented the monitor base will be behind -* the vector table. */ -#if (CONFIG_SYS_TEXT_BASE !=CONFIG_SYS_INT_FLASH_BASE ) -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x418)/* 24 Byte for CFM-Config */ -#endif -#define CONFIG_SYS_MONITOR_LEN 0x20000#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M53017EVB.h +0 -1
@@ -95,7 +95,6 @@#define CONFIG_SYS_SDRAM_EMOD 0x80010000#define CONFIG_SYS_SDRAM_MODE 0x00CD0000 -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5329EVB.h +0 -1
@@ -91,7 +91,6 @@#define CONFIG_SYS_SDRAM_EMOD 0x40010000#define CONFIG_SYS_SDRAM_MODE 0x018D0000 -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/M5373EVB.h +0 -1
@@ -93,7 +93,6 @@#define CONFIG_SYS_SDRAM_EMOD 0x40010000#define CONFIG_SYS_SDRAM_MODE 0x018D0000 -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/MCR3000.h +0 -1
@@ -80,7 +80,6 @@*/ #define CONFIG_SYS_BOOTMAPSZ (8 << 20)#define CONFIG_SYS_MONITOR_LEN (320 << 10) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* Environment Configuration */
include/configs/MPC837XERDB.h +0 -1
@@ -126,7 +126,6 @@/* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #if (CONFIG_SYS_MONITOR_BASE <CONFIG_SYS_FLASH_BASE )#define CONFIG_SYS_RAMBOOT
include/configs/MPC8548CDS.h +0 -2
@@ -136,8 +136,6 @@#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_HWCONFIG /* enable hwconfig */
include/configs/P1010RDB.h +0 -8
@@ -97,14 +97,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif -#ifdef CONFIG_TPL_BUILD -#define CONFIG_SYS_MONITOR_BASE 0xD0001000 -#elif defined(CONFIG_SPL_BUILD ) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -/* High Level Configuration Options */ #if defined(CONFIG_PCI )
include/configs/P2041RDB.h +0 -2
@@ -143,8 +143,6 @@#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#if defined(CONFIG_RAMBOOT_PBL )#define CONFIG_SYS_RAMBOOT #endif
include/configs/T102xRDB.h +0 -6
@@ -311,12 +311,6 @@#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3#endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -#if defined(CONFIG_RAMBOOT_PBL )#define CONFIG_SYS_RAMBOOT #endif
include/configs/T104xRDB.h +0 -6
@@ -296,12 +296,6 @@#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3#endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -#if defined(CONFIG_RAMBOOT_PBL )#define CONFIG_SYS_RAMBOOT #endif
include/configs/T208xQDS.h +0 -6
@@ -296,12 +296,6 @@#define CONFIG_SYS_RAMBOOT #endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -#define CONFIG_HWCONFIG /* define to use L1 as initial stack */
include/configs/T208xRDB.h +0 -6
@@ -254,12 +254,6 @@#define CONFIG_SYS_RAMBOOT #endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -#define CONFIG_HWCONFIG /* define to use L1 as initial stack */
include/configs/T4240RDB.h +0 -6
@@ -100,12 +100,6 @@#define CONFIG_SYS_FLASH_BASE 0xe0000000#define CONFIG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CONFIG_SYS_FLASH_BASE) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -#define CONFIG_HWCONFIG /* define to use L1 as initial stack */
include/configs/adp-ae3xx.h +0 -1
@@ -152,7 +152,6 @@#define PHYS_FLASH_1 0x88000000/* BANK 0 */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, } -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_ERASE_TOUT 120000/* TO for Flash Erase (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* TO for Flash Write (ms) */
include/configs/adp-ag101p.h +0 -1
@@ -268,7 +268,6 @@#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, } -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_ERASE_TOUT 120000/* TO for Flash Erase (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* TO for Flash Write (ms) */
include/configs/am335x_evm.h +0 -1
@@ -240,7 +240,6 @@#define CONFIG_SYS_FLASH_BASE (0x08000000)#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT#define CONFIG_SYS_FLASH_SIZE 0x01000000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#endif /* NOR support */ #endif /* ! __CONFIG_AM335X_EVM_H */
include/configs/am3517_evm.h +0 -3
@@ -111,9 +111,6 @@#define CONFIG_SYS_FLASH_BASE NAND_BASE#endif -/* Monitor at start of flash */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10)/* 128 KiB */ /* Defines for SPL */
include/configs/amcore.h +0 -1
@@ -45,7 +45,6 @@/* amcore design has flash data bytes wired swapped */ #define CONFIG_SYS_WRITE_SWAPPED_DATA /* reserve 128-4KB */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400)#define CONFIG_SYS_MONITOR_LEN ((128 - 4) * 1024)#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024)
include/configs/ap121.h +0 -2
@@ -9,8 +9,6 @@#define CONFIG_SYS_MHZ 200#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0x80000000
include/configs/ap143.h +0 -2
@@ -9,8 +9,6 @@#define CONFIG_SYS_MHZ 325#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0x80000000
include/configs/ap152.h +0 -2
@@ -9,8 +9,6 @@#define CONFIG_SYS_MHZ 375#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0x80000000
include/configs/armadillo-800eva.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_SYS_SDRAM_BASE (ARMADILLO_800EVA_SDRAM_BASE)#define CONFIG_SYS_SDRAM_SIZE (ARMADILLO_800EVA_SDRAM_SIZE) -#define CONFIG_SYS_MONITOR_BASE 0x00000000#define CONFIG_SYS_MONITOR_LEN (256 * 1024)#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
include/configs/astro_mcf5373l.h +0 -6
@@ -201,12 +201,6 @@#define CONFIG_SYS_FLASH_BASE 0x00000000 -#ifdef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#else -/* This is mainly used during relocation in start.S */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif /* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
include/configs/at91sam9263ek.h +0 -1
@@ -43,7 +43,6 @@#define CONFIG_SYS_MAX_FLASH_SECT 256#define CONFIG_SYS_MONITOR_SEC 1:0-3 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Address and size of Primary Environment Sector */
include/configs/ax25-ae350.h +0 -1
@@ -82,7 +82,6 @@#define PHYS_FLASH_1 0x88000000/* BANK 0 */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, } -#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1#define CONFIG_SYS_FLASH_ERASE_TOUT 120000/* TO for Flash Erase (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* TO for Flash Write (ms) */
include/configs/axs10x.h +0 -1
@@ -18,7 +18,6 @@/* * Memory configuration */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/bmips_common.h +0 -3
@@ -17,7 +17,4 @@#define CONFIG_SYS_BOOTPARAMS_LEN SZ_128K#define CONFIG_SYS_CBSIZE SZ_512 -/* U-Boot */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif /* __CONFIG_BMIPS_COMMON_H */
include/configs/boston.h +0 -2
@@ -31,8 +31,6 @@#define CONFIG_SYS_INIT_SP_OFFSET 0x400000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* * Console */
include/configs/ci20.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_SYS_SDRAM_BASE 0x80000000/* cached (KSEG0) address */ #define CONFIG_SYS_INIT_SP_OFFSET 0x400000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* NS16550-ish UARTs */ #define CONFIG_SYS_NS16550_CLK 48000000
include/configs/cobra5272.h +0 -6
@@ -189,12 +189,6 @@ enter a valid image address in flash */#define CONFIG_SYS_FLASH_BASE 0xffe00000 -#ifdef CONFIG_MONITOR_IS_IN_RAM -#define CONFIG_SYS_MONITOR_BASE 0x20000 -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif -#define CONFIG_SYS_MONITOR_LEN 0x20000#define CONFIG_SYS_BOOTPARAMS_LEN 64*1024
include/configs/colibri_pxa270.h +0 -1
@@ -86,7 +86,6 @@#define CONFIG_SYS_FLASH_UNLOCK_TOUT (25 * CONFIG_SYS_HZ)#endif -#define CONFIG_SYS_MONITOR_BASE 0x0#define CONFIG_SYS_MONITOR_LEN 0x40000/* Skip factory configuration block */
include/configs/corenet_ds.h +0 -2
@@ -141,8 +141,6 @@#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#if defined(CONFIG_RAMBOOT_PBL )#define CONFIG_SYS_RAMBOOT #endif
include/configs/dra7xx_evm.h +0 -1
@@ -98,7 +98,6 @@#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT#define CONFIG_SYS_FLASH_SIZE (64 * 1024 * 1024)/* 64 MB */ #define CONFIG_SYS_FLASH_BASE (0x08000000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE/* Reduce SPL size by removing unlikey targets */ #endif /* NOR support */
include/configs/edison.h +0 -1
@@ -16,7 +16,6 @@#define CONFIG_SYS_STACK_SIZE (32 * 1024) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* RTC */
include/configs/emsdp.h +0 -2
@@ -8,8 +8,6 @@#include <linux/sizes.h> -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_SDRAM_BASE 0x10000000#define CONFIG_SYS_SDRAM_SIZE SZ_16M
include/configs/exynos5-common.h +0 -2
@@ -56,8 +56,6 @@#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* SPI */ /* Ethernet Controllor Driver */
include/configs/gardena-smart-gateway-mt7688.h +0 -3
@@ -44,9 +44,6 @@#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)#define CONFIG_SYS_CBSIZE 512 -/* U-Boot */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* Environment settings */ /*
include/configs/gazerbeam.h +0 -1
@@ -24,7 +24,6 @@/* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (512 * 1024)/* Reserve 512 kB for Mon */
include/configs/hsdk-4xd.h +0 -1
@@ -20,7 +20,6 @@/* * Memory configuration */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/hsdk.h +0 -1
@@ -19,7 +19,6 @@/* * Memory configuration */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/ids8313.h +0 -1
@@ -197,7 +197,6 @@/* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MONITOR_LEN (768 * 1024)/*
include/configs/imgtec_xilfpga.h +0 -2
@@ -28,8 +28,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - 0x1000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/*---------------------------------------------------------------------- * Commands */
include/configs/imx27lite-common.h +0 -1
@@ -83,7 +83,6 @@#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE / \ CONFIG_SYS_FLASH_SECT_SZ) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#define CONFIG_SYS_MONITOR_LEN 0x40000/* Reserve 256KiB */ /* Address and size of Redundant Environment Sector */
include/configs/integratorcp.h +0 -22
@@ -37,26 +37,4 @@#define CONFIG_SYS_MAX_FLASH_SECT 64#define CONFIG_SYS_MONITOR_LEN 0x00100000 -/* -* Move up the U-Boot & monitor area if more flash is fitted. -* If this U-Boot is to be run on Integrators with varying flash sizes, -* drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG -* register and dynamically assign CONFIG_ENV_ADDR & CONFIG_SYS_MONITOR_BASE -* - CONFIG_SYS_MONITOR_BASE is set to indicate that the environment is not -* embedded in the boot monitor(s) area -*/ -#if (PHYS_FLASH_SIZE ==0x04000000 ) - -#define CONFIG_SYS_MONITOR_BASE 0x27F40000 - -#elif (PHYS_FLASH_SIZE ==0x02000000 ) - -#define CONFIG_SYS_MONITOR_BASE 0x25F40000 - -#else - -#define CONFIG_SYS_MONITOR_BASE 0x27F40000 - -#endif -#endif /* __CONFIG_H */
include/configs/iot_devkit.h +0 -2
@@ -44,8 +44,6 @@* - Reading data from weird addresses */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define SRAM_BASE 0x30000000#define SRAM_SIZE SZ_128K
include/configs/km/km-mpc83xx.h +0 -1
@@ -23,7 +23,6 @@/* * The reserved memory */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #define CONFIG_SYS_FLASH_BASE 0xF0000000#if (CONFIG_SYS_MONITOR_BASE <CONFIG_SYS_FLASH_BASE )
include/configs/km/pg-wcom-ls102xa.h +0 -1
@@ -195,7 +195,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #define CONFIG_SYS_MONITOR_LEN 0x100000/* 1Mbyte */ #define CONFIG_SYS_BOOTCOUNT_BE
include/configs/kmcent2.h +0 -1
@@ -345,7 +345,6 @@ GENERATED_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #define CONFIG_SYS_MONITOR_LEN 0xc0000/* 768k */ /*
include/configs/kzm9g.h +0 -1
@@ -41,7 +41,6 @@#define CONFIG_SYS_SDRAM_BASE (KZM_SDRAM_BASE + CONFIG_SDRAM_OFFSET_FOR_RT)#define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_SIZE - CONFIG_SDRAM_OFFSET_FOR_RT) -#define CONFIG_SYS_MONITOR_BASE (KZM_FLASH_BASE)#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)#define CONFIG_STANDALONE_LOAD_ADDR 0x41000000
include/configs/linkit-smart-7688.h +0 -3
@@ -45,9 +45,6 @@#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)#define CONFIG_SYS_CBSIZE 512 -/* U-Boot */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* Environment settings */ /*
include/configs/ls1021aiot.h +0 -7
@@ -142,13 +142,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -/* start of monitor */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -#include <asm/fsl_secure_boot.h> #endif
include/configs/ls1021aqds.h +0 -6
@@ -383,12 +383,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -/* * Environment */
include/configs/ls1021atsn.h +0 -6
@@ -191,12 +191,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -/* Environment */ #define CONFIG_SYS_BOOTM_LEN 0x8000000/* 128 MB */
include/configs/ls1021atwr.h +0 -6
@@ -361,12 +361,6 @@#define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -/* * Environment */
include/configs/ls1028a_common.h +0 -2
@@ -74,8 +74,6 @@#define OCRAM_NONSECURE_SIZE 0x00010000#define CONFIG_SYS_FSL_QSPI_BASE 0x20000000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* I2C bus multiplexer */ #define I2C_MUX_PCA_ADDR_PRI 0x77/* Primary Mux*/ #define I2C_MUX_CH_DEFAULT 0x8
include/configs/ls1028aqds.h +0 -6
@@ -58,12 +58,6 @@/* Store environment at top of flash */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -/* LPUART */ #ifdef CONFIG_LPUART #define CFG_LPUART_MUX_MASK 0xf0
include/configs/ls1028ardb.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_QIXIS_I2C_ACCESS /*
include/configs/ls1043aqds.h +0 -6
@@ -321,12 +321,6 @@#define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -/* * Environment */
include/configs/ls1046aqds.h +0 -2
@@ -339,8 +339,6 @@#define CONFIG_SYS_INIT_SP_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -/* * Environment */
include/configs/ls1088aqds.h +0 -6
@@ -311,12 +311,6 @@#endif #endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -#define CONFIG_FSL_MEMAC /* MMC */
include/configs/ls1088ardb.h +0 -6
@@ -222,12 +222,6 @@#define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#endif -#define CONFIG_FSL_MEMAC #ifndef SPL_NO_ENV
include/configs/malta.h +0 -1
@@ -27,7 +27,6 @@/* * Memory map */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#ifdef CONFIG_64BIT # define CONFIG_SYS_SDRAM_BASE 0xffffffff80000000
include/configs/mt7620.h +0 -2
@@ -10,8 +10,6 @@#define CONFIG_SYS_MIPS_TIMER_FREQ 290000000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0x80000000
include/configs/mt7628.h +0 -2
@@ -10,8 +10,6 @@#define CONFIG_SYS_MIPS_TIMER_FREQ 290000000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0x80000000
include/configs/nsim.h +0 -1
@@ -11,7 +11,6 @@/* * Memory configuration */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/octeon_common.h +0 -1
@@ -15,7 +15,6 @@#endif #define CONFIG_SYS_SDRAM_BASE 0xffffffff80000000 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_BOOTM_LEN (64 << 20)/* 64M */
include/configs/odroid.h +0 -2
@@ -30,8 +30,6 @@#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* Partitions name */ #define PARTS_BOOT "boot"#define PARTS_ROOT "platform"
include/configs/omap3_logic.h +0 -3
@@ -157,9 +157,6 @@#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT#define CONFIG_SYS_FLASH_SIZE 0x4000000 -/* Monitor at start of flash */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10)/* 128 KiB */ /* Defines for SPL */
include/configs/origen.h +0 -2
@@ -21,8 +21,6 @@#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20)/* ram console */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* Power Down Modes */ #define S5P_CHECK_SLEEP 0x00000BAD#define S5P_CHECK_DIDLE 0xBAD00000
include/configs/p1_p2_rdb_pc.h +0 -10
@@ -122,16 +122,6 @@#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc#endif -#ifndef CONFIG_SYS_MONITOR_BASE -#ifdef CONFIG_TPL_BUILD -#define CONFIG_SYS_MONITOR_BASE 0xf8f81000 -#elif defined(CONFIG_SPL_BUILD ) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE -#else -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#endif -#endif -#define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */ #define CONFIG_PCIE2 /* PCIE controller 2 (slot 2) */
include/configs/pic32mzdask.h +0 -1
@@ -30,7 +30,6 @@#define CONFIG_SYS_SDRAM_BASE 0x88000000#define CONFIG_SYS_BOOTPARAMS_LEN (4 << 10) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MONITOR_LEN (192 << 10)/* Memory Test */
include/configs/qemu-arm.h +0 -1
@@ -65,7 +65,6 @@#define CONFIG_SYS_CBSIZE 512 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MAX_FLASH_SECT 256/* Sector: 256K, Bank: 64M */ #endif /* __CONFIG_H */
include/configs/qemu-ppce500.h +0 -2
@@ -45,8 +45,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);#define CONFIG_SYS_BOOT_BLOCK 0x00000000/* boot TLB */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_HWCONFIG #define CONFIG_SYS_INIT_RAM_ADDR 0x00100000
include/configs/r2dplus.h +0 -1
@@ -13,7 +13,6 @@#define CONFIG_SYS_PBSIZE 256/* Address of u-boot image in Flash */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE)#define CONFIG_SYS_MONITOR_LEN (256 * 1024)#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
include/configs/rcar-gen2-common.h +0 -1
@@ -25,7 +25,6 @@#define CONFIG_SYS_SDRAM_BASE (RCAR_GEN2_SDRAM_BASE)#define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) -#define CONFIG_SYS_MONITOR_BASE 0x00000000#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Timer */
include/configs/rcar-gen3-common.h +0 -1
@@ -41,7 +41,6 @@#define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_SYS_MONITOR_BASE 0x00000000#define CONFIG_SYS_MONITOR_LEN (1 * 1024 * 1024)#define CONFIG_SYS_BOOTM_LEN (64 << 20)
include/configs/s5p4418_nanopi2.h +0 -1
@@ -19,7 +19,6 @@* System memory Configuration */ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MEM_SIZE 0x40000000#define CONFIG_SYS_SDRAM_BASE 0x71000000
include/configs/s5p_goni.h +0 -1
@@ -134,7 +134,6 @@#define PHYS_SDRAM_3 0x50000000/* mDDR DMC2 Bank #2 */ #define PHYS_SDRAM_3_SIZE (128 << 20)/* 128 MB in Bank #2 */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* 256 KiB */ /* FLASH and environment organization */
include/configs/s5pc210_universal.h +0 -2
@@ -26,8 +26,6 @@#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20)/* ram console */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define NORMAL_MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT
include/configs/sandbox.h +0 -1
@@ -20,7 +20,6 @@#define CONFIG_SYS_SDRAM_BASE 0#define CONFIG_SYS_SDRAM_SIZE \ (SB_TO_UL(CONFIG_SANDBOX_RAM_SIZE_MB) << 20) -#define CONFIG_SYS_MONITOR_BASE 0#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200}
include/configs/smdkc100.h +0 -2
@@ -97,8 +97,6 @@#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE (128 << 20)/* 0x8000000, 128 MB Bank #1 */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/*----------------------------------------------------------------------- * FLASH and environment organization */
include/configs/socfpga_soc64_common.h +0 -1
@@ -14,7 +14,6 @@/* * U-Boot general configurations */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210
include/configs/socrates.h +0 -2
@@ -96,8 +96,6 @@#define CONFIG_SYS_FLASH_ERASE_TOUT 60000/* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500/* Flash Write Timeout (ms) */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ -#define CONFIG_SYS_LBC_LCRR 0x00030004/* LB clock ratio reg */ #define CONFIG_SYS_LBC_LBCR 0x00000000/* LB config reg */ #define CONFIG_SYS_LBC_LSRT 0x20000000/* LB sdram refresh timer */
include/configs/stmark2.h +0 -6
@@ -81,12 +81,6 @@#define CONFIG_SERIAL_BOOT #endif -#if defined(CONFIG_SERIAL_BOOT ) -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#endif -#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024)/* Reserve 256 kB for Monitor */ #define CONFIG_SYS_MONITOR_LEN (256 << 10)
include/configs/tb100.h +0 -1
@@ -11,7 +11,6 @@/* * Memory configuration */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE
include/configs/tplink_wdr4300.h +0 -2
@@ -9,8 +9,6 @@#define CONFIG_SYS_MHZ 280#define CONFIG_SYS_MIPS_TIMER_FREQ (CONFIG_SYS_MHZ * 1000000) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_BOOTPARAMS_LEN 0x20000#define CONFIG_SYS_SDRAM_BASE 0xa0000000
include/configs/trats.h +0 -2
@@ -30,8 +30,6 @@#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20)/* ram console */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc"#define PARTS_BOOT "boot"
include/configs/trats2.h +0 -2
@@ -29,8 +29,6 @@#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20)/* ram console */ -#define CONFIG_SYS_MONITOR_BASE 0x00000000 -/* Tizen - partitions definitions */ #define PARTS_CSA "csa-mmc"#define PARTS_BOOT "boot"
include/configs/uniphier.h +0 -1
@@ -39,7 +39,6 @@#define BOOTENV #endif -#define CONFIG_SYS_MONITOR_BASE 0#define CONFIG_SYS_MONITOR_LEN 0x00200000/* 2MB */ #define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
include/configs/vcoreiii.h +0 -2
@@ -32,8 +32,6 @@#error Unknown DDR size - please add!#endif -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#if defined(CONFIG_MTDIDS_DEFAULT ) && defined(CONFIG_MTDPARTS_DEFAULT )#define VCOREIII_DEFAULT_MTD_ENV \ "mtdparts="CONFIG_MTDPARTS_DEFAULT"\0" \
include/configs/vexpress_common.h +0 -1
@@ -175,7 +175,6 @@#define CONFIG_SYS_FLASH_SIZE 0x04000000#define CONFIG_SYS_FLASH_BASE0 V2M_NOR0#define CONFIG_SYS_FLASH_BASE1 V2M_NOR1 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE0/* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ)/* Erase Timeout */
include/configs/vocore2.h +0 -3
@@ -38,9 +38,6 @@#define CONFIG_SYS_BOOTPARAMS_LEN (128 * 1024)#define CONFIG_SYS_CBSIZE 512 -/* U-Boot */ -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -/* Environment settings */ #endif //__VOCORE2_CONFIG_H__
include/configs/x86-common.h +0 -1
@@ -47,7 +47,6 @@*/ #define CONFIG_SYS_STACK_SIZE (32 * 1024) -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/*----------------------------------------------------------------------- * Environment configuration
include/configs/xtfpga.h +0 -3
@@ -183,19 +183,16 @@# define CONFIG_SYS_FLASH_SECT_SZ 0x10000/* block size 64KB */ # define CONFIG_SYS_FLASH_PARMSECT_SZ 0x2000/* param size 8KB */ # define CONFIG_SYS_FLASH_BASE IOADDR(0x08000000) -# define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#elif defined(CONFIG_XTFPGA_KC705 )# define CONFIG_SYS_FLASH_SIZE 0x8000000/* 128MB */ # define CONFIG_SYS_FLASH_SECT_SZ 0x20000/* block size 128KB */ # define CONFIG_SYS_FLASH_PARMSECT_SZ 0x8000/* param size 32KB */ # define CONFIG_SYS_FLASH_BASE IOADDR(0x00000000) -# define CONFIG_SYS_MONITOR_BASE IOADDR(0x06000000)#else # define CONFIG_SYS_FLASH_SIZE 0x1000000/* 16MB */ # define CONFIG_SYS_FLASH_SECT_SZ 0x20000/* block size 128KB */ # define CONFIG_SYS_FLASH_PARMSECT_SZ 0x8000/* param size 32KB */ # define CONFIG_SYS_FLASH_BASE IOADDR(0x08000000) -# define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE#endif #define CONFIG_SYS_MAX_FLASH_SECT \ (CONFIG_SYS_FLASH_SECT_SZ/CONFIG_SYS_FLASH_PARMSECT_SZ + \
Signature · 1 line
2.25.1
PATCH 11/11 global: Remove CONFIG_SYS_EXTRA_OPTIONS support
In reply to Tom RiniAll options have now been migrated to Kconfig correctly so remove this support.
--- boot/Kconfig | 13 -------- doc/README.kconfig | 7 ---- doc/develop/moveconfig.rst | 3 +- scripts/Makefile.autoconf | 4 --- scripts/build-whitelist.sh | 23 ++------------ tools/genboardscfg.py | 12 +------ tools/moveconfig.py | 65 -------------------------------------- 7 files changed, 5 insertions(+), 122 deletions(-)
boot/Kconfig +0 -13
@@ -339,19 +339,6 @@ config OF_STDOUT_VIA_ALIAS incorrect when used with device tree as this option does not exist / should not be used. -config SYS_EXTRA_OPTIONS - string "Extra Options (DEPRECATED)" - help - The old configuration infrastructure (= mkconfig + boards.cfg) - provided the extra options field. If you have something like - "HAS_BAR,BAZ=64", the optional options - #define CONFIG_HAS - #define CONFIG_BAZ 64 - will be defined in include/config.h. - This option was prepared for the smooth migration from the old - configuration to Kconfig. Since this option will be removed sometime, - new boards should not use this option. - config HAVE_SYS_TEXT_BASE bool depends on !NIOS2 && !XTENSA
doc/README.kconfig +0 -7
@@ -99,7 +99,6 @@ Kconfig. Each field of boards.cfg was converted as follows: Vendor -> CONFIG_SYS_VENDOR defined by Kconfig Board -> CONFIG_SYS_BOARD defined by Kconfig Target -> File name of defconfig (configs/<target>_defconfig) - Options -> CONFIG_SYS_EXTRA_OPTIONS defined by Kconfig Maintainers -> "M:" entry of MAINTAINERS
@@ -140,12 +139,6 @@ When removing an obsolete board, the following steps are generally needed: TODO ---- -- The option field of boards.cfg, which was used for the pre-Kconfig - configuration, moved to CONFIG_SYS_EXTRA_OPTIONS verbatim now. - Board maintainers are expected to implement proper Kconfig options - and switch over to them. Eventually CONFIG_SYS_EXTRA_OPTIONS will go away. - CONFIG_SYS_EXTRA_OPTIONS should not be used for new boards. - - In the pre-Kconfig, a single board had multiple entries in the boards.cfg file with differences in the option fields. The corresponding defconfig files were auto-generated when switching to Kconfig. Now we have too many
doc/develop/moveconfig.rst +1 -2
@@ -295,8 +295,7 @@ Available options -y, --yes Instead of prompting, automatically go ahead with all operations. This - includes cleaning up headers, CONFIG_SYS_EXTRA_OPTIONS, the config whitelist - and the README. + includes cleaning up headers, the config whitelist and the README. To see the complete list of supported options, run::
scripts/Makefile.autoconf +0 -4
@@ -100,10 +100,6 @@ tpl/include/autoconf.mk: tpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \ - echo \#define CONFIG_$$i \ - | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ - done; \ echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
scripts/build-whitelist.sh +3 -20
@@ -10,30 +10,13 @@ # export LC_ALL=C LC_COLLATE=C -# There are two independent greps. The first pulls out the component parts -# of CONFIG_SYS_EXTRA_OPTIONS. An example is: +# Looks for the rest of the CONFIG options, but exclude those in Kconfig and +# defconfig files. # -# SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) -# -# We want this to produce: -# CONFIG_SUN7I_GMAC -# CONFIG_AHCI -# CONFIG_SATAPWR -# -# The second looks for the rest of the CONFIG options, but excludes those in -# Kconfig and defconfig files. -# -( -git grep CONFIG_SYS_EXTRA_OPTIONS |sed -n \ - 's/.*CONFIG_SYS_EXTRA_OPTIONS="\(.*\)"/\1/ p' \ - | tr , '\n' \ - | sed 's/ *\([A-Za-z0-9_]*\).*/CONFIG_\1/' - git grep CONFIG_ | \ egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \ | tr ' \t' '\n\n' \ - | sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' -) \ + | sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \ |sort |uniq >scripts/config_whitelist.txt.tmp1; # Finally, we need a list of the valid Kconfig options to exclude these from
tools/genboardscfg.py +1 -11
@@ -111,7 +111,6 @@ class KconfigScanner: 'vendor' : 'SYS_VENDOR', 'board' : 'SYS_BOARD', 'config' : 'SYS_CONFIG_NAME', - 'options' : 'SYS_EXTRA_OPTIONS' } def __init__(self):
@@ -149,7 +148,6 @@ class KconfigScanner: 'board': <board_name>, 'target': <target_name>, 'config': <config_header_name>, - 'options': <extra_options> } """ # strip special prefixes and save it in a temporary file
@@ -185,14 +183,6 @@ class KconfigScanner: if params['arch'] == 'arm' and params['cpu'] == 'armv8': params['arch'] = 'aarch64' - # fix-up options field. It should have the form: - # <config name>[:comma separated config options] - if params['options'] != '-': - params['options'] = params['config'] + ':' + \ - params['options'].replace(r'\"', '"') - elif params['config'] != params['target']: - params['options'] = params['config'] - return params def scan_defconfigs_for_multiprocess(queue, defconfigs):
@@ -378,7 +368,7 @@ def format_and_output(params_list, output): output: The path to the output file """ FIELDS = ('status', 'arch', 'cpu', 'soc', 'vendor', 'board', 'target', - 'options', 'maintainers') + 'maintainers') # First, decide the width of each column max_length = dict([ (f, 0) for f in FIELDS])
tools/moveconfig.py +0 -65
77 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 5 lines · Tom Rini
The value
CONFIG_DB_784MP_GPis only used in the DDR code to refer toCONFIG_TARGET_DB_MV784MP_GPso just use that second value directly.Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>
Thanks,
Stefan
Quoted 52 lines
--- arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- drivers/ddr/marvell/axp/ddr3_axp.h | 2 +- drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- include/configs/db-mv784mp-gp.h | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-)arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +1
-1@@ -62,7 +62,7 @@ static u32 board_id_get(void)return DB_78X60_AMC_ID ;#elif defined(CONFIG_DB_78X60_PCAC_REV2 )return DB_78X60_PCAC_REV2_ID ; -#elif defined(CONFIG_DB_784MP_GP ) +#elif defined(CONFIG_TARGET_DB_MV784MP_GP )return DB_784MP_GP_ID ;#elif defined(CONFIG_RD_78460_CUSTOMER )return RD_78460_CUSTOMER_ID ;drivers/ddr/marvell/axp/ddr3_axp.h +1
-1@@ -37,7 +37,7 @@#define ECC_SUPPORT #endif #define NEW_FABRIC_TWSI_ADDR 0x4E -#ifdef CONFIG_DB_784MP_GP +#ifdef CONFIG_TARGET_DB_MV784MP_GP #define BUS_WIDTH_ECC_TWSI_ADDR 0x4E#else #define BUS_WIDTH_ECC_TWSI_ADDR 0x4Fdrivers/ddr/marvell/axp/ddr3_axp_config.h +1
-1@@ -138,7 +138,7 @@* Enables I2C auto detection different options */ #if defined(CONFIG_DB_88F78X60 ) || defined(CONFIG_DB_88F78X60_REV2 ) || \ - defined(CONFIG_DB_784MP_GP ) + defined(CONFIG_TARGET_DB_MV784MP_GP )#define AUTO_DETECTION_SUPPORT #endif #endif include/configs/db-mv784mp-gp.h +0
-0@@ -6,11 +6,6 @@#ifndef _CONFIG_DB_MV7846MP_GP_H
include/configs/db-mv784mp-gp.h line 11
Quoted 10 lines
include/configs/db-mv784mp-gp.h +0
-5#define _CONFIG_DB_MV7846MP_GP_H -/* -* High Level Configuration Options (easy to change) -*/ -#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ -/* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Quoted 6 lines · Tom Rini
The value
CONFIG_DB_784MP_GPis only used in the DDR code to refer toCONFIG_TARGET_DB_MV784MP_GPso just use that second value directly.Cc Stefan Roese <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Stefan Roese <[email protected]>
For the whole of the series, applied to u-boot/next, thanks!
Signature · 1 line
Tom