From c20ae2ffaa8b0c7b294330165a172d0f1dfe6dae Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Thu, 6 Oct 2016 07:55:15 +0200 Subject: spl: move SPL_OS_BOOT to Kconfig Move SPL_OS_BOOT to Kconfig and cleanup existing uses. Signed-off-by: Heiko Schocher --- include/configs/a3m071.h | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_igep0033.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 2 -- include/configs/duovero.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pepper.h | 1 - include/configs/smartweb.h | 1 - include/configs/taurus.h | 1 - include/configs/ti_armv7_common.h | 3 --- include/configs/ti_armv7_keystone2.h | 1 - include/configs/twister.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 22 files changed, 25 deletions(-) (limited to 'include/configs') diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 1919475..93be3d6 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -401,7 +401,6 @@ #define CONFIG_SPL_BSS_START_ADDR ((128 - 1) << 20) #define CONFIG_SPL_BSS_MAX_SIZE (64 << 10) -#define CONFIG_SPL_OS_BOOT /* Place patched DT blob (fdt) at this address */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x01800000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index daa7dd8..ec70b72 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -380,7 +380,6 @@ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index 18db58a..32aa392 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep0033.h @@ -123,7 +123,6 @@ #undef CONFIG_USE_IRQ /* SPL */ -#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 58df571..e69c1b6 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -54,7 +54,6 @@ #undef CONFIG_SYS_OMAP24_I2C_SPEED #define CONFIG_SYS_OMAP24_I2C_SPEED 1000 -#undef CONFIG_SPL_OS_BOOT #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 #ifdef CONFIG_SPL_OS_BOOT diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index f1ae1a6..ac47dec 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -513,7 +513,6 @@ DEFAULT_LINUX_BOOT_ENV \ */ #if defined(CONFIG_SPI_BOOT) /* SPL related */ -#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index e01d535..ccc5bb4 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_MTDPARTS #endif /* CONFIG_SPI_BOOT, ... */ -#undef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000 diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 6dbc9e9..7eed776 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -19,7 +19,6 @@ #undef CONFIG_BOARD_LATE_INIT #undef CONFIG_SPI #undef CONFIG_OMAP3_SPI -#undef CONFIG_SPL_OS_BOOT #undef CONFIG_BOOTCOUNT_LIMIT #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 92ff251..3a605f7 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -90,7 +90,6 @@ #define CONFIG_HSMMC2_8BIT #include -#undef CONFIG_SPL_OS_BOOT #undef CONFIG_SYS_MONITOR_LEN #undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index ddb1e97..a3b1e5f 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -16,8 +16,6 @@ #include -#undef CONFIG_SPL_OS_BOOT - /* EEPROM related defines */ #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 868158b..b5bd3ba 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -21,7 +21,6 @@ #include -#undef CONFIG_SPL_OS_BOOT #undef CONFIG_EFI_PARTITION #undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6caa3b1..882d213 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -14,7 +14,6 @@ /* Falcon Mode */ #define CONFIG_CMD_SPL -#define CONFIG_SPL_OS_BOOT #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K) diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 5f07629..381fe04 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -297,7 +297,6 @@ /* add FALCON boot mode */ #define CONFIG_CMD_SPL -#define CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR #define CONFIG_CMD_SPL_NAND_OFS 0x00180000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index a07bcc6..32b0c62 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -292,7 +292,6 @@ #endif /* for booting directly linux */ -#define CONFIG_SPL_OS_BOOT #define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + \ 0x60000) diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 4dcd5de..0f28278 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -26,7 +26,6 @@ /* Remove SPL boot option - we do not support that on LDP yet */ #undef CONFIG_SPL_FRAMEWORK -#undef CONFIG_SPL_OS_BOOT /* Generic NAND definition conflicts with debug_base */ #undef CONFIG_SYS_NAND_BASE diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 921d331..e99188f 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -11,7 +11,6 @@ #include #undef CONFIG_BOARD_LATE_INIT -#undef CONFIG_SPL_OS_BOOT /* Clock defines */ #define V_OSCK 24000000 /* Clock output from T2 */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 0302740..df5fe21 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -275,6 +275,5 @@ #define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF -#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #endif #endif /* __CONFIG_H */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 3a762e3..ab457da 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -139,7 +139,6 @@ #if defined(CONFIG_SPL_BUILD) /* SPL related */ -#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f5602b8..f31d5d3 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -205,9 +205,6 @@ * We also support Falcon Mode so that the Linux kernel can be booted * directly from SPL. This is not currently available on HS devices. */ -#if !defined(CONFIG_TI_SECURE_DEVICE) -#define CONFIG_SPL_OS_BOOT -#endif /* * Place the image at the start of the ROM defined image space (per diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 66d85be..7e365aa 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -301,7 +301,6 @@ #include /* We wont be loading up OS from SPL for now.. */ -#undef CONFIG_SPL_OS_BOOT /* We do not have MMC support.. yet.. */ #undef CONFIG_MMC diff --git a/include/configs/twister.h b/include/configs/twister.h index 66f4680..fd117b8 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -42,7 +42,6 @@ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ 0x600000) -#define CONFIG_SPL_OS_BOOT #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SPL_BOARD_INIT diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index adc42cf..cbdef6e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -268,7 +268,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE -#define CONFIG_SPL_OS_BOOT /* u-boot is like dtb */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "u-boot.bin" #define CONFIG_SYS_SPL_ARGS_ADDR 0x8000000 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 0118fd2..4f0253c 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -330,7 +330,6 @@ #endif /* for booting directly linux */ -#define CONFIG_SPL_OS_BOOT /* SP location before relocation, must use scratch RAM */ #define CONFIG_SPL_TEXT_BASE 0x0 -- cgit v1.1