mach-snapdragon: move default environment to a file

Make use of CONFIG_DEFAULT_ENV_FILE and move the default qcom
environment to a file under board/qualcomm.

This is much cleaner and means we don't need to recompile on changing
the environment.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/board/qualcomm/default.env b/board/qualcomm/default.env
new file mode 100644 (file)
index 0000000..dbf6f4e
--- /dev/null
+++ b/board/qualcomm/default.env
@@ -0,0 +1,11 @@
+stdin=serial,button-kbd
+stdout=serial,vidconsole
+stderr=serial,vidconsole
+preboot=scsi scan; usb start
+fastboot=fastboot -l $fastboot_addr_r usb 0
+do_boot=bootefi bootmgr
+bootmenu_0=Boot first available device=run do_boot
+bootmenu_1=Enable fastboot mode=run fastboot
+bootmenu_2=Reset device=reset
+menucmd=bootmenu
+bootcmd=run do_boot

diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index 22ce7dba72e792548bde6f3b6ea832277f98c7b2..49422374026c0063238d283c40f5c62337146d65 100644 (file)
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -36,6 +36,8 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
 CONFIG_BUTTON_QCOM_PMIC=y
+CONFIG_USE_DEFAULT_ENV_FILE=y
+CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env"
 CONFIG_CLK=y
 CONFIG_CLK_QCOM_APQ8016=y
 CONFIG_CLK_QCOM_APQ8096=y

diff --git a/include/configs/qcom.h b/include/configs/qcom.h
index e50b3bce5cdd24b95ab70d9c0479239c345672a0..5b5ebbd844dff4014f4370b7b15ef4e180dc7e8a 100644 (file)
--- a/include/configs/qcom.h
+++ b/include/configs/qcom.h
@@ -11,11 +11,4 @@
 
 #define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }
 
-/* Load addressed are calculated during board_late_init(). See arm/mach-snapdragon/board.c */
-#define CFG_EXTRA_ENV_SETTINGS \
-       "stdin=serial,button-kbd\0"     \
-       "stdout=serial,vidconsole\0"    \
-       "stderr=serial,vidconsole\0" \
-       "bootcmd=bootm $prevbl_initrd_start_addr\0"
-
 #endif