configs: migrate ubispl boards to KConfig

Migrate the ubispl configuration for the omap3_igep00x0 and
am335x_igep003x boards to KConfig. Both boards were built with
SOURCE_DATE_EPOCH=0 and found to be equal before and after.

Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Kyungmin Park <kmpark@infradead.org>
Cc: Javier Martínez Canillas <javier@dowhile0.org>
Cc: Enric Balletbo i Serra <eballetbo@gmail.com>
Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com>

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index f44fb09b31ddc0bc6872bab480600ad392ecdd27..5874831ba19eb39936d6e57c47c42a2b14b07382 100644 (file)
--- a/configs/am335x_igep003x_defconfig
+++ b/configs/am335x_igep003x_defconfig
@@ -21,6 +21,18 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_UBI=y
+CONFIG_SPL_UBI_MAX_VOL_LEBS=256
+CONFIG_SPL_UBI_MAX_PEB_SIZE=262144
+CONFIG_SPL_UBI_MAX_PEBS=4096
+CONFIG_SPL_UBI_PEB_OFFSET=4
+CONFIG_SPL_UBI_VID_OFFSET=512
+CONFIG_SPL_UBI_LEB_START=2048
+CONFIG_SPL_UBI_INFO_ADDR=0x88080000
+CONFIG_SPL_UBI_VOL_IDS=8
+CONFIG_SPL_UBI_LOAD_MONITOR_ID=0
+CONFIG_SPL_UBI_LOAD_KERNEL_ID=3
+CONFIG_SPL_UBI_LOAD_ARGS_ID=4
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index 927d7f0ecd78dca6f689c2ab5c10a5f6961d0302..ab11935f48dd9ae51e09d94970814f5f2ecc79f3 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -17,6 +17,18 @@ CONFIG_SPL_TEXT_BASE=0x40200000
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 # CONFIG_SPL_FS_EXT4 is not set
 CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_UBI=y
+CONFIG_SPL_UBI_MAX_VOL_LEBS=256
+CONFIG_SPL_UBI_MAX_PEB_SIZE=262144
+CONFIG_SPL_UBI_MAX_PEBS=4096
+CONFIG_SPL_UBI_PEB_OFFSET=4
+CONFIG_SPL_UBI_VID_OFFSET=512
+CONFIG_SPL_UBI_LEB_START=2048
+CONFIG_SPL_UBI_INFO_ADDR=0x88080000
+CONFIG_SPL_UBI_VOL_IDS=8
+CONFIG_SPL_UBI_LOAD_MONITOR_ID=0
+CONFIG_SPL_UBI_LOAD_KERNEL_ID=3
+CONFIG_SPL_UBI_LOAD_ARGS_ID=4
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_CMD_SPL=y

diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h
index 5131cd38e4edf81342fad79ba042819a6489b3ce..5b5e16026e835b8909c1f95862115c368595cac8 100644 (file)
--- a/include/configs/am335x_igep003x.h
+++ b/include/configs/am335x_igep003x.h
@@ -106,22 +106,6 @@
 /* NAND support */
 #define CONFIG_SYS_NAND_ONFI_DETECTION 1
 
-/* SPL */
-
-/* UBI configuration */
-#define CONFIG_SPL_UBI                 1
-#define CONFIG_SPL_UBI_MAX_VOL_LEBS    256
-#define CONFIG_SPL_UBI_MAX_PEB_SIZE    (256*1024)
-#define CONFIG_SPL_UBI_MAX_PEBS                4096
-#define CONFIG_SPL_UBI_VOL_IDS         8
-#define CONFIG_SPL_UBI_LOAD_MONITOR_ID 0
-#define CONFIG_SPL_UBI_LOAD_KERNEL_ID  3
-#define CONFIG_SPL_UBI_LOAD_ARGS_ID    4
-#define CONFIG_SPL_UBI_PEB_OFFSET      4
-#define CONFIG_SPL_UBI_VID_OFFSET      512
-#define CONFIG_SPL_UBI_LEB_START       2048
-#define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
-
 /* NAND config */
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_PAGE_COUNT     (CONFIG_SYS_NAND_BLOCK_SIZE / \

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index a95a9cc664d6ccdf01e7a080ded293143813e3c0..4ad7dc18b104c2a081affa43acf2684ffb8a0b36 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -96,18 +96,4 @@
 #define CONFIG_SYS_NAND_ECCBYTES       14
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
 
-/* UBI configuration */
-#define CONFIG_SPL_UBI                 1
-#define CONFIG_SPL_UBI_MAX_VOL_LEBS    256
-#define CONFIG_SPL_UBI_MAX_PEB_SIZE    (256*1024)
-#define CONFIG_SPL_UBI_MAX_PEBS                4096
-#define CONFIG_SPL_UBI_VOL_IDS         8
-#define CONFIG_SPL_UBI_LOAD_MONITOR_ID 0
-#define CONFIG_SPL_UBI_LOAD_KERNEL_ID  3
-#define CONFIG_SPL_UBI_LOAD_ARGS_ID    4
-#define CONFIG_SPL_UBI_PEB_OFFSET      4
-#define CONFIG_SPL_UBI_VID_OFFSET      512
-#define CONFIG_SPL_UBI_LEB_START       2048
-#define CONFIG_SPL_UBI_INFO_ADDR       0x88080000
-
 #endif /* __IGEP00X0_H */