| Message ID | 1440488896-6479-1-git-send-email-andreas.devel@googlemail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Aug 25, 2015 at 09:48:16AM +0200, Andreas Bießmann wrote: > 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> Applied to u-boot/master, thanks!
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 \
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> --- configs/picosam9g45_defconfig | 1 + include/configs/picosam9g45.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)