arndale: Enable config_distro_defaults.h

PATCH New Ian Campbell 4 participants 7 messages Sep 26, 2014 – Nov 12, 2014

lore

Share & tools

lore

Ian Campbell

author

2014-09-26 14:25 UTC #0 lore raw

PATCH 1/1 arndale: Enable config_distro_defaults.h

From: Ian Campbell <[email protected]>

...and remove explicit setting of things which this implies.

I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD

Signed-off-by Ian Campbell <[email protected]>

---
 include/configs/arndale.h | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

include/configs/arndale.h +2 ~~-20~~

index 75f9933..197d0fc 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 /* Power Down Modes */
 #define S5P_CHECK_SLEEP			0x00000BAD

@@ -98,15 +97,9 @@
 /* Command definition*/
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_HASH
 
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* USB */

@@ -133,8 +126,6 @@
 #define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */

@@ -201,8 +192,6 @@
 #define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
 #define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 #define CONFIG_CMD_PART
 #define CONFIG_PARTITION_UUIDS

@@ -221,6 +210,8 @@
 #define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
 #define CONFIG_I2C_EDID
 
+#include <config_distro_defaults.h>
+
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C

@@ -238,15 +229,6 @@
 #define CONFIG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#endif
-
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
 /* Enable Time Command */
 #define CONFIG_CMD_TIME

Signature · 1 line

2.1.0

Ian Campbell

author

2014-09-26 15:00 UTC #1 lore raw

PATCH 1/1 arndale: Enable config_distro_defaults.h

Quoted 7 lines · Ian Campbell

From: Ian Campbell <[email protected]>
...and remove explicit setting of things which this implies.
I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
Signed-off-by Ian Campbell <[email protected]>

Also FYI Inderpal Singh <[email protected]> bounces (person no longer @ linaro). Not sure what should happen to board/samsung/arndale/MAINTAINERS then.

Ian.

Ian Campbell

author

2014-09-29 10:24 UTC #2 lore raw

PATCH 1/1 arndale: Use config_distro_bootcmd.h

In reply to Ian Campbell

From: Ian Campbell <[email protected]>

Signed-off-by Ian Campbell <[email protected]>

---
 include/configs/arndale.h | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

include/configs/arndale.h +29 -9

index db7623d..a6630fd 100644
@@ -66,13 +66,6 @@
 /* Console configuration */
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define EXYNOS_DEVICE_SETTINGS \
-		"stdin=serial\0" \
-		"stdout=serial\0" \
-		"stderr=serial\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	EXYNOS_DEVICE_SETTINGS
 
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC

@@ -123,8 +116,6 @@
 #define CONFIG_SPL_TEXT_BASE	0x02023400
 #define CONFIG_SPL_MAX_FOOTPRINT	(14 * 1024)
 
-#define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */

@@ -212,6 +203,35 @@
 
 #include <config_distro_defaults.h>
 
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 1) \
+	func(MMC, mmc, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+
+/* 2GB RAM, bootm size of 256M, load scripts after that */
+#define MEM_LAYOUT_ENV_SETTINGS \
+	"bootm_size=0x10000000\0" \
+	"kernel_addr_r=0x42000000\0" \
+	"fdt_addr_r=0x43000000\0" \
+	"ramdisk_addr_r=0x43300000\0" \
+	"scriptaddr=0x50000000\0" \
+	"pxefile_addr_r=0x51000000\0"
+
+#define EXYNOS_DEVICE_SETTINGS \
+	"stdin=serial\0" \
+	"stdout=serial\0" \
+	"stderr=serial\0" \
+	"fdtfile=exynos5250-arndale.dtb\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	EXYNOS_DEVICE_SETTINGS \
+	MEM_LAYOUT_ENV_SETTINGS \
+	BOOTENV
+
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C

Signature · 1 line

2.1.0

Albert ARIBAUD

2014-11-12 09:18 UTC #3 lore raw

PATCH 1/1 arndale: Use config_distro_bootcmd.h

Hello Ian,

Quoted 6 lines · Ian Campbell

From: Ian Campbell <[email protected]>
Signed-off-by Ian Campbell <[email protected]>
---
 include/configs/arndale.h | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

This one does not apply cleanly any more. Can you look this up?

Amicalement,

Signature · 1 line

Albert.

Ian Campbell

author

2014-11-12 10:45 UTC #4 lore raw

PATCH 1/1 arndale: Use config_distro_bootcmd.h

Quoted 4 lines · Albert ARIBAUD

Hello Ian,
On Mon, 29 Sep 2014 11:24:32 +0100, Ian Campbell <[email protected]> wrote:

Quoted 8 lines

Quoted 6 lines
From: Ian Campbell <[email protected]>
Signed-off-by Ian Campbell <[email protected]>
---
 include/configs/arndale.h | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)
This one does not apply cleanly any more. Can you look this up?

I sent v3 a few days ago. According to
http://patchwork.ozlabs.org/project/uboot/list/?submitter=1109 it is assigned to and under-review-by prom.

Ian.

Ian Campbell

2014-10-15 08:57 UTC #5 lore raw

PATCH 1/1 arndale: Enable config_distro_defaults.h

In reply to Ian Campbell

Quoted 7 lines · Ian Campbell

From: Ian Campbell <[email protected]>
...and remove explicit setting of things which this implies.
I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
Signed-off-by Ian Campbell <[email protected]>

So it seems I need to rebase this over "config: Move arndale to use common exynos5250 file" which has made me wonder where in the chain arndale.h -> exynos5250-common.h -> exynos5-common.h -> exynos-common.h it would be appropriate to introduce the common config stuff.

Since config_cmd_default.h is in exynos-common.h my initial thought would be to do both distro_defaults and distro_bootcmd in exynos-common.h. Sound sane?

Ian.

Quoted 75 lines

---
 include/configs/arndale.h | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

include/configs/arndale.h +2 ~~-20~~

index 75f9933..197d0fc 100644
@@ -45,7 +45,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 /* Power Down Modes */
 #define S5P_CHECK_SLEEP			0x00000BAD

@@ -98,15 +97,9 @@
 /* Command definition*/
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_HASH
 
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* USB */

@@ -133,8 +126,6 @@
 #define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */

@@ -201,8 +192,6 @@
 #define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
 #define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 #define CONFIG_CMD_PART
 #define CONFIG_PARTITION_UUIDS

@@ -221,6 +210,8 @@
 #define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
 #define CONFIG_I2C_EDID
 
+#include <config_distro_defaults.h>
+
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C

@@ -238,15 +229,6 @@
 #define CONFIG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#endif
-
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
 /* Enable Time Command */
 #define CONFIG_CMD_TIME

Simon Glass

2014-10-15 10:55 UTC #6 lore raw

PATCH 1/1 arndale: Enable config_distro_defaults.h

Hi Ian,

Quoted 9 lines · Ian Campbell

Quoted 7 lines · Ian Campbell
From: Ian Campbell <[email protected]>
...and remove explicit setting of things which this implies.
I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
Signed-off-by Ian Campbell <[email protected]>

Quoted 8 lines

So it seems I need to rebase this over "config: Move arndale to use common exynos5250 file" which has made me wonder where in the chain arndale.h -> exynos5250-common.h -> exynos5-common.h -> exynos-common.h it would be appropriate to introduce the common config stuff.
Since config_cmd_default.h is in exynos-common.h my initial thought would be to do both distro_defaults and distro_bootcmd in exynos-common.h. Sound sane?

I like that idea.

Regards,
Simon