Convert CONFIG_SPL_BOARD_INIT to Kconfig

This converts the following to Kconfig:
   CONFIG_SPL_BOARD_INIT

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
[trini: Update the Kconfig logic]
Signed-off-by: Tom Rini <trini@konsulko.com>
master
Ley Foon Tan 7 years ago committed by Tom Rini
parent a375ff8e14
commit 0680f1b1f7
  1. 2
      README
  2. 5
      arch/arm/Kconfig
  3. 1
      arch/arm/include/asm/fsl_secure_boot.h
  4. 4
      arch/arm/mach-keystone/Kconfig
  5. 2
      arch/arm/mach-rockchip/Kconfig
  6. 1
      arch/arm/mach-socfpga/Kconfig
  7. 1
      arch/arm/mach-tegra/Kconfig
  8. 1
      board/freescale/common/Kconfig
  9. 8
      common/spl/Kconfig
  10. 1
      configs/a3m071_defconfig
  11. 1
      configs/a4m2k_defconfig
  12. 1
      configs/controlcenterdc_defconfig
  13. 1
      configs/da850_am18xxevm_defconfig
  14. 1
      configs/da850evm_defconfig
  15. 1
      configs/devkit3250_defconfig
  16. 1
      configs/edminiv2_defconfig
  17. 1
      configs/gwventana_emmc_defconfig
  18. 1
      configs/gwventana_gw5904_defconfig
  19. 1
      configs/gwventana_nand_defconfig
  20. 1
      configs/ipam390_defconfig
  21. 1
      configs/m53evk_defconfig
  22. 1
      configs/mccmon6_nor_defconfig
  23. 1
      configs/mccmon6_sd_defconfig
  24. 1
      configs/microblaze-generic_defconfig
  25. 1
      configs/omapl138_lcdk_defconfig
  26. 1
      configs/sandbox_spl_defconfig
  27. 1
      configs/woodburn_sd_defconfig
  28. 1
      configs/work_92105_defconfig
  29. 1
      include/configs/a3m071.h
  30. 1
      include/configs/am3517_crane.h
  31. 1
      include/configs/am3517_evm.h
  32. 1
      include/configs/at91sam9n12ek.h
  33. 1
      include/configs/at91sam9x5ek.h
  34. 1
      include/configs/bur_am335x_common.h
  35. 1
      include/configs/cm_t35.h
  36. 1
      include/configs/controlcenterdc.h
  37. 1
      include/configs/corvus.h
  38. 1
      include/configs/da850evm.h
  39. 1
      include/configs/devkit3250.h
  40. 1
      include/configs/edminiv2.h
  41. 1
      include/configs/gw_ventana.h
  42. 1
      include/configs/ipam390.h
  43. 1
      include/configs/kc1.h
  44. 1
      include/configs/m53evk.h
  45. 1
      include/configs/ma5d4evk.h
  46. 1
      include/configs/mccmon6.h
  47. 1
      include/configs/mcx.h
  48. 1
      include/configs/microblaze-generic.h
  49. 1
      include/configs/omap3_evm.h
  50. 1
      include/configs/omapl138_lcdk.h
  51. 1
      include/configs/rk3188_common.h
  52. 1
      include/configs/rk3288_common.h
  53. 1
      include/configs/sama5d2_ptc.h
  54. 1
      include/configs/sama5d2_xplained.h
  55. 1
      include/configs/sama5d3_xplained.h
  56. 1
      include/configs/sama5d3xek.h
  57. 1
      include/configs/sama5d4_xplained.h
  58. 1
      include/configs/sama5d4ek.h
  59. 2
      include/configs/sandbox_spl.h
  60. 1
      include/configs/siemens-am33x-common.h
  61. 1
      include/configs/smartweb.h
  62. 1
      include/configs/sniper.h
  63. 3
      include/configs/socfpga_common.h
  64. 1
      include/configs/tam3517-common.h
  65. 1
      include/configs/tao3530.h
  66. 1
      include/configs/taurus.h
  67. 1
      include/configs/tegra-common.h
  68. 2
      include/configs/ti814x_evm.h
  69. 2
      include/configs/ti816x_evm.h
  70. 1
      include/configs/ti_armv7_common.h
  71. 1
      include/configs/tricorder.h
  72. 1
      include/configs/twister.h
  73. 2
      include/configs/uniphier.h
  74. 1
      include/configs/woodburn_sd.h
  75. 1
      include/configs/work_92105.h
  76. 1
      include/configs/xilinx_zynqmp.h
  77. 1
      include/configs/zynq-common.h

@ -292,7 +292,7 @@ board_init_r():
- stack is optionally in SDRAM, if CONFIG_SPL_STACK_R is defined and - stack is optionally in SDRAM, if CONFIG_SPL_STACK_R is defined and
CONFIG_SPL_STACK_R_ADDR points into SDRAM CONFIG_SPL_STACK_R_ADDR points into SDRAM
- preloader_console_init() can be called here - typically this is - preloader_console_init() can be called here - typically this is
done by defining CONFIG_SPL_BOARD_INIT and then supplying a done by selecting CONFIG_SPL_BOARD_INIT and then supplying a
spl_board_init() function containing this call spl_board_init() function containing this call
- loads U-Boot or (in falcon mode) Linux - loads U-Boot or (in falcon mode) Linux

@ -281,6 +281,7 @@ choice
config ARCH_AT91 config ARCH_AT91
bool "Atmel AT91" bool "Atmel AT91"
select SPL_BOARD_INIT if SPL
config TARGET_EDB93XX config TARGET_EDB93XX
bool "Support edb93xx" bool "Support edb93xx"
@ -553,6 +554,7 @@ config ARCH_KEYSTONE
config ARCH_OMAP2PLUS config ARCH_OMAP2PLUS
bool "TI OMAP2+" bool "TI OMAP2+"
select CPU_V7 select CPU_V7
select SPL_BOARD_INIT if SPL
select SUPPORT_SPL select SUPPORT_SPL
imply FIT imply FIT
@ -674,6 +676,7 @@ config ARCH_ZYNQ
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL select OF_CONTROL
select SPL_BOARD_INIT if SPL
select SPL_OF_CONTROL if SPL select SPL_OF_CONTROL if SPL
select DM select DM
select DM_ETH select DM_ETH
@ -701,6 +704,7 @@ config ARCH_ZYNQMP
select DM_SERIAL select DM_SERIAL
select SUPPORT_SPL select SUPPORT_SPL
select CLK select CLK
select SPL_BOARD_INIT if SPL
select SPL_CLK select SPL_CLK
select DM_USB if USB select DM_USB if USB
@ -943,6 +947,7 @@ config ARCH_UNIPHIER
select OF_CONTROL select OF_CONTROL
select OF_LIBFDT select OF_LIBFDT
select PINCTRL select PINCTRL
select SPL_BOARD_INIT if SPL
select SPL_DM if SPL select SPL_DM if SPL
select SPL_LIBCOMMON_SUPPORT if SPL select SPL_LIBCOMMON_SUPPORT if SPL
select SPL_LIBGENERIC_SUPPORT if SPL select SPL_LIBGENERIC_SUPPORT if SPL

@ -13,7 +13,6 @@
#define CONFIG_SHA_HW_ACCEL #define CONFIG_SHA_HW_ACCEL
#define CONFIG_SHA_PROG_HW_ACCEL #define CONFIG_SHA_PROG_HW_ACCEL
#define CONFIG_SPL_BOARD_INIT
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
/* /*
* Define the key hash for U-Boot here if public/private key pair used to * Define the key hash for U-Boot here if public/private key pair used to

@ -6,19 +6,23 @@ choice
config TARGET_K2HK_EVM config TARGET_K2HK_EVM
bool "TI Keystone 2 Kepler/Hawking EVM" bool "TI Keystone 2 Kepler/Hawking EVM"
select SPL_BOARD_INIT if SPL
imply DM_I2C imply DM_I2C
config TARGET_K2E_EVM config TARGET_K2E_EVM
bool "TI Keystone 2 Edison EVM" bool "TI Keystone 2 Edison EVM"
select SPL_BOARD_INIT if SPL
imply DM_I2C imply DM_I2C
config TARGET_K2L_EVM config TARGET_K2L_EVM
bool "TI Keystone 2 Lamar EVM" bool "TI Keystone 2 Lamar EVM"
select SPL_BOARD_INIT if SPL
imply DM_I2C imply DM_I2C
config TARGET_K2G_EVM config TARGET_K2G_EVM
bool "TI Keystone 2 Galileo EVM" bool "TI Keystone 2 Galileo EVM"
select BOARD_LATE_INIT select BOARD_LATE_INIT
select SPL_BOARD_INIT if SPL
select TI_I2C_BOARD_DETECT select TI_I2C_BOARD_DETECT
imply DM_I2C imply DM_I2C

@ -14,6 +14,7 @@ config ROCKCHIP_RK3036
config ROCKCHIP_RK3188 config ROCKCHIP_RK3188
bool "Support Rockchip RK3188" bool "Support Rockchip RK3188"
select CPU_V7 select CPU_V7
select SPL_BOARD_INIT if SPL
select SUPPORT_SPL select SUPPORT_SPL
select SUPPORT_TPL select SUPPORT_TPL
select SPL select SPL
@ -30,6 +31,7 @@ config ROCKCHIP_RK3188
config ROCKCHIP_RK3288 config ROCKCHIP_RK3288
bool "Support Rockchip RK3288" bool "Support Rockchip RK3288"
select CPU_V7 select CPU_V7
select SPL_BOARD_INIT if SPL
select SUPPORT_SPL select SUPPORT_SPL
select SPL select SPL
help help

@ -39,6 +39,7 @@ config TARGET_SOCFPGA_ARRIA5
config TARGET_SOCFPGA_ARRIA10 config TARGET_SOCFPGA_ARRIA10
bool bool
select SPL_BOARD_INIT if SPL
config TARGET_SOCFPGA_CYCLONE5 config TARGET_SOCFPGA_CYCLONE5
bool bool

@ -49,6 +49,7 @@ config TEGRA_ARMV7_COMMON
bool "Tegra 32-bit common options" bool "Tegra 32-bit common options"
select CPU_V7 select CPU_V7
select SPL select SPL
select SPL_BOARD_INIT if SPL
select SUPPORT_SPL select SUPPORT_SPL
select TEGRA_COMMON select TEGRA_COMMON
select TEGRA_GPIO select TEGRA_GPIO

@ -2,5 +2,6 @@ config CHAIN_OF_TRUST
depends on !FIT_SIGNATURE && SECURE_BOOT depends on !FIT_SIGNATURE && SECURE_BOOT
imply CMD_BLOB imply CMD_BLOB
select FSL_CAAM select FSL_CAAM
select SPL_BOARD_INIT if (ARM && SPL)
bool bool
default y default y

@ -16,6 +16,14 @@ config SPL
help help
If you want to build SPL as well as the normal image, say Y. If you want to build SPL as well as the normal image, say Y.
config SPL_BOARD_INIT
depends on SPL
bool "Call board-specific initialization in SPL"
help
If this option is enabled, U-Boot will call the function
spl_board_init() from board_init_r(). This function should be
provided by the board.
config SPL_RAW_IMAGE_SUPPORT config SPL_RAW_IMAGE_SUPPORT
bool "Support SPL loading and booting of RAW images" bool "Support SPL loading and booting of RAW images"
depends on SPL depends on SPL

@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y

@ -11,6 +11,7 @@ CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y

@ -11,6 +11,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_ELF is not set # CONFIG_CMD_ELF is not set

@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PROMPT="U-Boot > "
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

@ -9,6 +9,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

@ -9,6 +9,7 @@ CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_ARCH_MISC_INIT=y CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="EDMiniV2> " CONFIG_SYS_PROMPT="EDMiniV2> "

@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y

@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y

@ -20,6 +20,7 @@ CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y

@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="U-Boot > " CONFIG_SYS_PROMPT="U-Boot > "

@ -15,6 +15,7 @@ CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_ASKENV=y CONFIG_CMD_ASKENV=y

@ -7,6 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
# CONFIG_CMD_BMODE is not set # CONFIG_CMD_BMODE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg,MX6QDL" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg,MX6QDL"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
# CONFIG_CMD_BMODE is not set # CONFIG_CMD_BMODE is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg,MX6QDL" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg,MX6QDL"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_OS_BOOT=y CONFIG_SPL_OS_BOOT=y

@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set

@ -21,6 +21,7 @@ CONFIG_CONSOLE_RECORD=y
CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
CONFIG_SILENT_CONSOLE=y CONFIG_SILENT_CONSOLE=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y
CONFIG_CMD_CPU=y CONFIG_CMD_CPU=y
CONFIG_CMD_LICENSE=y CONFIG_CMD_LICENSE=y

@ -10,6 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

@ -9,6 +9,7 @@ CONFIG_VERSION_VARIABLE=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set

@ -388,7 +388,6 @@
* SPL related defines * SPL related defines
*/ */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_TEXT_BASE 0xfc000000 #define CONFIG_SPL_TEXT_BASE 0xfc000000
/* Place BSS for SPL near end of SDRAM */ /* Place BSS for SPL near end of SDRAM */

@ -250,7 +250,6 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \

@ -300,7 +300,6 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_SPL_TEXT_BASE 0x40200000
#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \

@ -197,7 +197,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#define CONFIG_SYS_MASTER_CLOCK 132096000 #define CONFIG_SYS_MASTER_CLOCK 132096000

@ -191,7 +191,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#define CONFIG_SYS_MASTER_CLOCK 132096000 #define CONFIG_SYS_MASTER_CLOCK 132096000

@ -105,7 +105,6 @@
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN
/* General parts of the framework, required. */ /* General parts of the framework, required. */
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#endif /* ! __BUR_AM335X_COMMON_H__ */ #endif /* ! __BUR_AM335X_COMMON_H__ */

@ -262,7 +262,6 @@
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS
#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_ECC

@ -17,7 +17,6 @@
#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_DISPLAY_BOARDINFO_LATE
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT
#define CONFIG_SPL_BOARD_INIT
/* /*
* TEXT_BASE needs to be below 16MiB, since this area is scrubbed * TEXT_BASE needs to be below 16MiB, since this area is scrubbed

@ -148,7 +148,6 @@
#define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE
#define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K) #define CONFIG_SPL_BSS_MAX_SIZE (SZ_2K)
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE
#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_ECC

@ -308,7 +308,6 @@
#ifndef CONFIG_DIRECT_NOR_BOOT #ifndef CONFIG_DIRECT_NOR_BOOT
/* defines for SPL */ /* defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
CONFIG_SYS_MALLOC_LEN) CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN

@ -181,7 +181,6 @@
/* SPL will use SRAM as stack */ /* SPL will use SRAM as stack */
#define CONFIG_SPL_STACK 0x0000FFF8 #define CONFIG_SPL_STACK 0x0000FFF8
#define CONFIG_SPL_BOARD_INIT
/* Use the framework and generic lib */ /* Use the framework and generic lib */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK

@ -25,7 +25,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x00040000 #define CONFIG_SYS_SPL_MALLOC_START 0x00040000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x0001ffff #define CONFIG_SYS_SPL_MALLOC_SIZE 0x0001ffff
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/orion5x/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/orion5x/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_UBOOT_BASE 0xfff90000 #define CONFIG_SYS_UBOOT_BASE 0xfff90000
#define CONFIG_SYS_UBOOT_START 0x00800000 #define CONFIG_SYS_UBOOT_START 0x00800000
#define CONFIG_SYS_TEXT_BASE 0x00800000 #define CONFIG_SYS_TEXT_BASE 0x00800000

@ -8,7 +8,6 @@
#define __CONFIG_H #define __CONFIG_H
/* SPL */ /* SPL */
#define CONFIG_SPL_BOARD_INIT
/* Location in NAND to read U-Boot from */ /* Location in NAND to read U-Boot from */
#define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M) #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M)

@ -273,7 +273,6 @@
/* defines for SPL */ /* defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
CONFIG_SYS_MALLOC_LEN) CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN

@ -90,7 +90,6 @@
#define CONFIG_SYS_SPL_MALLOC_SIZE (1024 * 1024) #define CONFIG_SYS_SPL_MALLOC_SIZE (1024 * 1024)
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
/* /*
* Console * Console

@ -218,7 +218,6 @@
*/ */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx" #define CONFIG_SPL_TARGET "u-boot-with-nand-spl.imx"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_TEXT_BASE 0x70008000 #define CONFIG_SPL_TEXT_BASE 0x70008000
#define CONFIG_SPL_PAD_TO 0x8000 #define CONFIG_SPL_PAD_TO 0x8000
#define CONFIG_SPL_STACK 0x70004000 #define CONFIG_SPL_STACK 0x70004000

@ -206,7 +206,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_LOAD

@ -14,7 +14,6 @@
#define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT
#include "imx6_spl.h" #include "imx6_spl.h"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
#define CONFIG_SPL_OS_BOOT #define CONFIG_SPL_OS_BOOT

@ -289,7 +289,6 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE

@ -275,7 +275,6 @@
/* SPL part */ /* SPL part */
#define CONFIG_CMD_SPL #define CONFIG_CMD_SPL
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds"

@ -317,7 +317,6 @@
#define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_OMAP3_ID_NAND
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"

@ -330,7 +330,6 @@
#ifndef CONFIG_DIRECT_NOR_BOOT #ifndef CONFIG_DIRECT_NOR_BOOT
/* defines for SPL */ /* defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
CONFIG_SYS_MALLOC_LEN) CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN

@ -25,7 +25,6 @@
#define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_MEM32
#define CONFIG_SPL_BOARD_INIT
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* Bootrom will load u-boot binary to 0x60000000 once return from SPL */ /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */

@ -23,7 +23,6 @@
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SYS_NS16550_MEM32
#define CONFIG_SPL_BOARD_INIT
#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
/* Bootrom will load u-boot binary to 0x0 once return from SPL */ /* Bootrom will load u-boot binary to 0x0 once return from SPL */

@ -115,7 +115,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_SERIALFLASH #ifdef CONFIG_SYS_USE_SERIALFLASH

@ -79,7 +79,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC

@ -97,7 +97,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC

@ -126,7 +126,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC

@ -75,7 +75,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC

@ -73,7 +73,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x20080000 #define CONFIG_SYS_SPL_MALLOC_START 0x20080000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MONITOR_LEN (512 << 10) #define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC

@ -8,8 +8,6 @@
#include <configs/sandbox.h> #include <configs/sandbox.h>
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#endif #endif

@ -127,7 +127,6 @@
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_AM33XX_BCH
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS

@ -233,7 +233,6 @@
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN
#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds #define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14)
#define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SYS_USE_NANDFLASH 1
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS

@ -87,7 +87,6 @@
#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"

@ -307,9 +307,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR
#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE
#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
#define CONFIG_SPL_BOARD_INIT
#endif
/* SPL SDMMC boot support */ /* SPL SDMMC boot support */
#ifdef CONFIG_SPL_MMC_SUPPORT #ifdef CONFIG_SPL_MMC_SUPPORT

@ -170,7 +170,6 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_CONSOLE #define CONFIG_SPL_CONSOLE
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_SOFTECC

@ -244,7 +244,6 @@
#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS
#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_ECC

@ -246,7 +246,6 @@
#define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE
#define CONFIG_SPL_BSS_MAX_SIZE (3 * SZ_512) #define CONFIG_SPL_BSS_MAX_SIZE (3 * SZ_512)
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14) #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14)
#define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SYS_USE_NANDFLASH 1
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS

@ -91,7 +91,6 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \
CONFIG_SPL_TEXT_BASE) CONFIG_SPL_TEXT_BASE)

@ -156,8 +156,6 @@
#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
/* /*
* 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
* 64 bytes before this address should be set aside for u-boot.img's * 64 bytes before this address should be set aside for u-boot.img's

@ -122,8 +122,6 @@
#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_TEXT_BASE 0x80800000 #define CONFIG_SYS_TEXT_BASE 0x80800000
#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 #define CONFIG_SYS_SPL_MALLOC_START 0x80208000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000

@ -216,7 +216,6 @@
#endif #endif
/* General parts of the framework, required. */ /* General parts of the framework, required. */
#define CONFIG_SPL_BOARD_INIT
#ifdef CONFIG_NAND #ifdef CONFIG_NAND
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE

@ -273,7 +273,6 @@
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_BASE
#define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_DRIVERS
#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_ECC

@ -43,6 +43,5 @@
0x600000) 0x600000)
#define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100)
#define CONFIG_SPL_BOARD_INIT
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

@ -289,8 +289,6 @@
#define CONFIG_SPL_BOARD_LOAD_IMAGE #define CONFIG_SPL_BOARD_LOAD_IMAGE
#endif #endif
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000
/* subtract sizeof(struct image_header) */ /* subtract sizeof(struct image_header) */

@ -22,7 +22,6 @@
*/ */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm1136/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm1136/u-boot-spl.lds"
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_TEXT_BASE 0x10002300 #define CONFIG_SPL_TEXT_BASE 0x10002300
#define CONFIG_SPL_MAX_SIZE (64 * 1024) /* 8 KB for stack */ #define CONFIG_SPL_MAX_SIZE (64 * 1024) /* 8 KB for stack */

@ -173,7 +173,6 @@
#define CONFIG_SPL_TEXT_BASE 0x00000000 #define CONFIG_SPL_TEXT_BASE 0x00000000
/* SPL will use SRAM as stack */ /* SPL will use SRAM as stack */
#define CONFIG_SPL_STACK 0x0000FFF8 #define CONFIG_SPL_STACK 0x0000FFF8
#define CONFIG_SPL_BOARD_INIT
/* Use the framework and generic lib */ /* Use the framework and generic lib */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
/* SPL will use serial */ /* SPL will use serial */

@ -271,7 +271,6 @@
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
/* u-boot is like dtb */ /* u-boot is like dtb */
#define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin" #define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin"

@ -284,7 +284,6 @@
/* SPL part */ /* SPL part */
#define CONFIG_CMD_SPL #define CONFIG_CMD_SPL
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds" #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds"

Loading…
Cancel
Save