Skip to contentSkip to conversation

exynos5: Use config_distro_bootcmd.h

PATCH New Ian Campbell 3 participants 3 messages Oct 16, 2014 – Oct 30, 2014 Arm Samsung Exynos

lore
Share & tools
lore

Ian Campbell

author
#0 lore raw

PATCH v2 2/2 exynos5: Use config_distro_bootcmd.h

From: Ian Campbell <[email protected]>

This replaces the existing CONFIG_BOOTCOMMAND for exynos5250 and 5420.

exynos4 platforms seem to have existing complex extra env configuration for booting and so are excluded here. Hence the bootcmd.h is added to exynos5-common.h.

I have build tested on all exynos platforms (MAKEALL -s exynos), but only boot tested on arndale.

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

---
v2: This was previously "arndale: Use config_distro_bootcmd.h" but required significant rebasing.

Is replacing the existing bootcommand in this way acceptable? The distro_bootcmd.h infrastructure does not seem to provide a way to integrate the "raw" style of booting.

---
 include/configs/arndale.h           |  3 +++
 include/configs/exynos5-common.h    | 45 ++++++++++++++++++++++++++++++-------
 include/configs/exynos5-dt-common.h | 17 ++++++--------
 include/configs/exynos5250-common.h |  2 --
 include/configs/exynos5420-common.h |  2 --
 5 files changed, 47 insertions(+), 22 deletions(-)
include/configs/arndale.h +3 -0
index a87806d..919729d 100644
@@ -9,6 +9,9 @@
 #ifndef __CONFIG_ARNDALE_H
 #define __CONFIG_ARNDALE_H
 
+#define EXYNOS_FDTFILE_SETTING \
+	"fdtfile=exynos5250-arndale.dtb\0"
+
 #include "exynos5250-common.h"
 
 /* SD/MMC configuration */
include/configs/exynos5-common.h +37 -8

55 lines not on this page · raw message

include/configs/exynos5-dt-common.h +7 -10
index 66547fa..9cef0b0 100644
@@ -9,6 +9,13 @@
 #ifndef __CONFIG_EXYNOS5_DT_COMMON_H
 #define __CONFIG_EXYNOS5_DT_COMMON_H
 
+/* Console configuration */
+#undef EXYNOS_DEVICE_SETTINGS
+#define EXYNOS_DEVICE_SETTINGS \
+		"stdin=serial,cros-ec-keyb\0" \
+		"stdout=serial,lcd\0" \
+		"stderr=serial,lcd\0"
+
 #include "exynos5-common.h"
 
 /* PMIC */

@@ -22,14 +29,4 @@
 #define CONFIG_CMD_CROS_EC
 #define CONFIG_KEYBOARD
 
-/* Console configuration */
-#undef EXYNOS_DEVICE_SETTINGS
-#define EXYNOS_DEVICE_SETTINGS \
-		"stdin=serial,cros-ec-keyb\0" \
-		"stdout=serial,lcd\0" \
-		"stderr=serial,lcd\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	EXYNOS_DEVICE_SETTINGS
-
 #endif
include/configs/exynos5250-common.h +0 -2
index 713614f..a0107e8 100644
@@ -29,8 +29,6 @@
 
 #define CONFIG_SPL_TEXT_BASE	0x02023400
 
-#define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
-
 #define CONFIG_IRAM_STACK	0x02050000
 
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
include/configs/exynos5420-common.h +0 -2
index b0f940c..3cf9f01 100644
@@ -44,8 +44,6 @@
 
 #define CONFIG_BOARD_REV_GPIO_COUNT	2
 
-#define CONFIG_BOOTCOMMAND	"mmc read 20007000 451 2000; bootm 20007000"
-
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 
 /*
Signature · 1 line
2.1.0
#1 lore raw

PATCH v2 2/2 exynos5: Use config_distro_bootcmd.h

Quoted 4 lines · Ian Campbell

From: Ian Campbell <[email protected]>

This replaces the existing CONFIG_BOOTCOMMAND for exynos5250 and 5420.

Quoted 8 lines

exynos4 platforms seem to have existing complex extra env configuration for booting and so are excluded here. Hence the bootcmd.h is added to exynos5-common.h.

I have build tested on all exynos platforms (MAKEALL -s exynos), but only boot tested on arndale.

Signed-off-by Ian Campbell <[email protected]>
Reviewed-by Simon Glass <[email protected]>
#2 lore raw

PATCH v2 2/2 exynos5: Use config_distro_bootcmd.h

In reply to Ian Campbell
Quoted 19 lines · Ian Campbell

From: Ian Campbell <[email protected]>

This replaces the existing CONFIG_BOOTCOMMAND for exynos5250 and 5420.

exynos4 platforms seem to have existing complex extra env configuration for booting and so are excluded here. Hence the bootcmd.h is added to exynos5-common.h.

I have build tested on all exynos platforms (MAKEALL -s exynos), but only boot tested on arndale.

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

---
v2: This was previously "arndale: Use config_distro_bootcmd.h" but required significant rebasing.

Is replacing the existing bootcommand in this way acceptable? The distro_bootcmd.h infrastructure does not seem to provide a way to integrate the "raw" style of booting.

Quoted 8 lines
---
 include/configs/arndale.h           |  3 +++
 include/configs/exynos5-common.h    | 45 ++++++++++++++++++++++++++++++-------
 include/configs/exynos5-dt-common.h | 17 ++++++--------
 include/configs/exynos5250-common.h |  2 --
 include/configs/exynos5420-common.h |  2 --
 5 files changed, 47 insertions(+), 22 deletions(-)

please rebase this patch.

Thanks,
Minkyu Kang.