diff mbox series

[U-Boot] armv8: ls1088ardb: Put distro boot functions under CONFIG_SPL_BUILD

Message ID 1515152309-19357-1-git-send-email-Ashish.Kumar@nxp.com
State Not Applicable
Delegated to: York Sun
Headers show
Series [U-Boot] armv8: ls1088ardb: Put distro boot functions under CONFIG_SPL_BUILD | expand

Commit Message

Ashish Kumar Jan. 5, 2018, 11:38 a.m. UTC 
Remove distro related stuff from SPL-uboot to save on SPL size.

Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
Signed-off-by: Pankit Garg <pankit.garg@nxp.com>
---

Size reduction is approx 5K
depends upon
http://patchwork.ozlabs.org/patch/853615/
http://patchwork.ozlabs.org/patch/854402/

 include/configs/ls1088ardb.h | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

Comments

Sumit Garg Jan. 5, 2018, 1:27 p.m. UTC | #1 
Hi Ashish,

Changes in below patch are already part of following patch already in upstream.

https://patchwork.ozlabs.org/patch/806983/

Regards,
Sumit

> -----Original Message-----

> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Ashish

> Kumar

> Sent: Friday, January 05, 2018 5:08 PM

> To: u-boot@lists.denx.de

> Cc: Pankit Garg <pankit.garg@nxp.com>

> Subject: [U-Boot] [PATCH] armv8: ls1088ardb: Put distro boot functions under

> CONFIG_SPL_BUILD

> 

> Remove distro related stuff from SPL-uboot to save on SPL size.

> 

> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>

> Signed-off-by: Pankit Garg <pankit.garg@nxp.com>

> ---

> 

> Size reduction is approx 5K

> depends upon

> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch

> work.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Csumit.garg%40nx

> p.com%7C73fa100c2a554dda5df408d55430b3f2%7C686ea1d3bc2b4c6fa92cd99c

> 5c301635%7C0%7C0%7C636507490531835553&sdata=%2FaSTyJNHM%2BYZUvJf

> CB9NMjrJn9OU7WBVkrFkx36pYJI%3D&reserved=0

> https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch

> work.ozlabs.org%2Fpatch%2F854402%2F&data=02%7C01%7Csumit.garg%40nx

> p.com%7C73fa100c2a554dda5df408d55430b3f2%7C686ea1d3bc2b4c6fa92cd99c

> 5c301635%7C0%7C0%7C636507490531835553&sdata=k8F7Yezv%2F2GA5DfcIAx

> T%2FcztGNSqZDl9YsNtHhGBqdk%3D&reserved=0

> 

>  include/configs/ls1088ardb.h | 42

> +++++++++++++++++++++++++++++++++++++++++-

>  1 file changed, 41 insertions(+), 1 deletion(-)

> 

> diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index

> ad01a99..3661065 100644

> --- a/include/configs/ls1088ardb.h

> +++ b/include/configs/ls1088ardb.h

> @@ -285,6 +285,8 @@

>  #endif

> 

>  #undef CONFIG_EXTRA_ENV_SETTINGS

> +

> +#ifndef CONFIG_SPL_BUILD

>  #define CONFIG_EXTRA_ENV_SETTINGS		\

>  	"BOARD=ls1088ardb\0"			\

>  	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\

> @@ -357,6 +359,43 @@

>  		"$kernelhdr_addr_sd $kernelhdr_size_sd "	\

>  		" && esbc_validate ${kernelheader_addr_r};"	\

>  		"bootm $load_addr#$BOARD\0"

> +#else

> +#if defined(CONFIG_QSPI_BOOT)

> +#undef CONFIG_EXTRA_ENV_SETTINGS

> +#define CONFIG_EXTRA_ENV_SETTINGS		\

> +	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \

> +	"loadaddr=0x90100000\0"                 \

> +	"kernel_addr=0x100000\0"                \

> +	"ramdisk_addr=0x800000\0"               \

> +	"ramdisk_size=0x2000000\0"              \

> +	"fdt_high=0xa0000000\0"                 \

> +	"initrd_high=0xffffffffffffffff\0"      \

> +	"kernel_start=0x1000000\0"              \

> +	"kernel_load=0xa0000000\0"              \

> +	"kernel_size=0x2800000\0"               \

> +	"mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"  \

> +	"sf read 0x80100000 0xE00000 0x100000;" \

> +	"fsl_mc start mc 0x80000000 0x80100000\0"       \

> +	"mcmemsize=0x70000000 \0"

> +#elif defined(CONFIG_SD_BOOT)

> +#undef CONFIG_EXTRA_ENV_SETTINGS

> +#define CONFIG_EXTRA_ENV_SETTINGS               \

> +	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \

> +	"loadaddr=0x90100000\0"                 \

> +	"kernel_addr=0x800\0"                \

> +	"ramdisk_addr=0x800000\0"               \

> +	"ramdisk_size=0x2000000\0"              \

> +	"fdt_high=0xa0000000\0"                 \

> +	"initrd_high=0xffffffffffffffff\0"      \

> +	"kernel_start=0x8000\0"              \

> +	"kernel_load=0xa0000000\0"              \

> +	"kernel_size=0x14000\0"               \

> +	"mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;"  \

> +	"mmc read 0x80100000 0x7000 0x800;" \

> +	"fsl_mc start mc 0x80000000 0x80100000\0"       \

> +	"mcmemsize=0x70000000 \0"

> +#endif

> +#endif

> 

>  #undef CONFIG_BOOTCOMMAND

>  #if defined(CONFIG_QSPI_BOOT)

> @@ -414,14 +453,15 @@

>  #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33

>  #endif

> 

> +#ifndef CONFIG_SPL_BUILD

>  #undef CONFIG_CMDLINE_EDITING

>  #include <config_distro_defaults.h>

> -

>  #define BOOT_TARGET_DEVICES(func) \

>  	func(MMC, mmc, 0) \

>  	func(SCSI, scsi, 0) \

>  	func(DHCP, dhcp, na)

>  #include <config_distro_bootcmd.h>

> +#endif

> 

>  #include <asm/fsl_secure_boot.h>

> 

> --

> 2.7.4

> 

> _______________________________________________

> U-Boot mailing list

> U-Boot@lists.denx.de

> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.

> denx.de%2Flistinfo%2Fu-

> boot&data=02%7C01%7Csumit.garg%40nxp.com%7C73fa100c2a554dda5df408d

> 55430b3f2%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63650749053

> 1835553&sdata=J7kUe5IXg8MCzzFgVEiWUpkhg1LjFc0iIPr7S080Eeo%3D&reserv

> ed=0
diff mbox series

Patch

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index ad01a99..3661065 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -285,6 +285,8 @@ 
 #endif
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
+
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
@@ -357,6 +359,43 @@ 
 		"$kernelhdr_addr_sd $kernelhdr_size_sd "	\
 		" && esbc_validate ${kernelheader_addr_r};"	\
 		"bootm $load_addr#$BOARD\0"
+#else
+#if defined(CONFIG_QSPI_BOOT)
+#undef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS		\
+	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
+	"loadaddr=0x90100000\0"                 \
+	"kernel_addr=0x100000\0"                \
+	"ramdisk_addr=0x800000\0"               \
+	"ramdisk_size=0x2000000\0"              \
+	"fdt_high=0xa0000000\0"                 \
+	"initrd_high=0xffffffffffffffff\0"      \
+	"kernel_start=0x1000000\0"              \
+	"kernel_load=0xa0000000\0"              \
+	"kernel_size=0x2800000\0"               \
+	"mcinitcmd=sf probe 0:0;sf read 0x80000000 0xA00000 0x100000;"  \
+	"sf read 0x80100000 0xE00000 0x100000;" \
+	"fsl_mc start mc 0x80000000 0x80100000\0"       \
+	"mcmemsize=0x70000000 \0"
+#elif defined(CONFIG_SD_BOOT)
+#undef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS               \
+	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
+	"loadaddr=0x90100000\0"                 \
+	"kernel_addr=0x800\0"                \
+	"ramdisk_addr=0x800000\0"               \
+	"ramdisk_size=0x2000000\0"              \
+	"fdt_high=0xa0000000\0"                 \
+	"initrd_high=0xffffffffffffffff\0"      \
+	"kernel_start=0x8000\0"              \
+	"kernel_load=0xa0000000\0"              \
+	"kernel_size=0x14000\0"               \
+	"mcinitcmd=mmcinfo;mmc read 0x80000000 0x5000 0x800;"  \
+	"mmc read 0x80100000 0x7000 0x800;" \
+	"fsl_mc start mc 0x80000000 0x80100000\0"       \
+	"mcmemsize=0x70000000 \0"
+#endif
+#endif
 
 #undef CONFIG_BOOTCOMMAND
 #if defined(CONFIG_QSPI_BOOT)
@@ -414,14 +453,15 @@ 
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
+#ifndef CONFIG_SPL_BUILD
 #undef CONFIG_CMDLINE_EDITING
 #include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(SCSI, scsi, 0) \
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
+#endif
 
 #include <asm/fsl_secure_boot.h>