summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2015-08-25 09:48:16 +0200
committerTom Rini <trini@konsulko.com>2015-08-28 12:33:18 -0400
commit9316412f46fbdeec81a3f5a40bae383a405b9a4a (patch)
tree4a50773352c25eba6c095613266233ed29a99213
parent610751e94f6691ccb834daf56e288f5025765ee5 (diff)
downloadu-boot-imx-9316412f46fbdeec81a3f5a40bae383a405b9a4a.zip
u-boot-imx-9316412f46fbdeec81a3f5a40bae383a405b9a4a.tar.gz
u-boot-imx-9316412f46fbdeec81a3f5a40bae383a405b9a4a.tar.bz2
picosam9g45: adopt CONFIG_SYS_PROMPT
Commit 181bd9dc61d2da88b78f1c1138a685dae39354d6 introduced Kconfig selection for SYS_PROMPT. When applying the new picosam9g45 board this change slipped through, adopt it. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
-rw-r--r--configs/picosam9g45_defconfig1
-rw-r--r--include/configs/picosam9g45.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig
index 4128193..ccca1ca 100644
--- a/configs/picosam9g45_defconfig
+++ b/configs/picosam9g45_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_PICOSAM9G45=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC"
+CONFIG_SYS_PROMPT="U-Boot> "
# CONFIG_CMD_BDI is not set
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index e3039c2..9e9b1d0 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -156,7 +156,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_PROMPT "U-Boot> "
#define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \