diff mbox series

[U-Boot,v2,7/9] configs: migrate ubispl boards to KConfig

Message ID 20190515131600.28798-8-mk@mkio.de
State Accepted
Commit 4bae76d7331cf959af2c35254260476d098d2846
Delegated to: Heiko Schocher
Headers show
Series miscellaneous ubispl and ubi improvements | expand

Commit Message

Markus Klotzbuecher May 15, 2019, 1:15 p.m. UTC 
From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>

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>
---
Changes for v2: new patch

 configs/am335x_igep003x_defconfig | 12 ++++++++++++
 configs/igep00x0_defconfig        | 12 ++++++++++++
 include/configs/am335x_igep003x.h | 16 ----------------
 include/configs/omap3_igep00x0.h  | 14 --------------
 4 files changed, 24 insertions(+), 30 deletions(-)

Comments

Enric Balletbo Serra May 20, 2019, 8:50 p.m. UTC | #1 
Missatge de Markus Klotzbuecher <mk@mkio.de> del dia dc., 15 de maig
2019 a les 15:16:
>
> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
>
> 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>

Thanks,
 Enric

> ---
> Changes for v2: new patch
>
>  configs/am335x_igep003x_defconfig | 12 ++++++++++++
>  configs/igep00x0_defconfig        | 12 ++++++++++++
>  include/configs/am335x_igep003x.h | 16 ----------------
>  include/configs/omap3_igep00x0.h  | 14 --------------
>  4 files changed, 24 insertions(+), 30 deletions(-)
>
> diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
> index f44fb09b31..5874831ba1 100644
> --- 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 927d7f0ecd..ab11935f48 100644
> --- 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 5131cd38e4..5b5e16026e 100644
> --- 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 a95a9cc664..4ad7dc18b1 100644
> --- 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 */
> --
> 2.20.1
>
Heiko Schocher June 13, 2019, 3:32 a.m. UTC | #2 
Hello Markus,

Am 15.05.2019 um 15:15 schrieb Markus Klotzbuecher:
> From: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
> 
> 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>
> ---
> Changes for v2: new patch
> 
>   configs/am335x_igep003x_defconfig | 12 ++++++++++++
>   configs/igep00x0_defconfig        | 12 ++++++++++++
>   include/configs/am335x_igep003x.h | 16 ----------------
>   include/configs/omap3_igep00x0.h  | 14 --------------
>   4 files changed, 24 insertions(+), 30 deletions(-)

Thanks!

Travis buils is fine, pushed to u-boot-ubi.git next

bye,
Heiko
diff mbox series

Patch

diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig
index f44fb09b31..5874831ba1 100644
--- 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 927d7f0ecd..ab11935f48 100644
--- 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 5131cd38e4..5b5e16026e 100644
--- 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 a95a9cc664..4ad7dc18b1 100644
--- 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 */