This adds following things :
- New config and defconfig for Peach-Pi board.
- Alterations in Kconfig and MAINTAINERS.
- Addition of CONFIG_EXYNOS5800.
- ADdition of exynos5800-peach-pi in dts list.
Signed-off-by: Akshay Saraswat <aksha...@samsung.com>
---
arch/arm/cpu/armv7/exynos/Kconfig | 5 ++++-
board/samsung/smdk5420/Kconfig | 16 ++++++++++++++++
board/samsung/smdk5420/MAINTAINERS | 2 ++
configs/peach-pi_defconfig | 4 ++++
include/configs/exynos5420.h | 3 ++-
include/configs/peach-pi.h | 35 +++++++++++++++++++++++++++++++++++
include/configs/peach-pit.h | 4 ++--
7 files changed, 65 insertions(+), 4 deletions(-)
create mode 100644 configs/peach-pi_defconfig
create mode 100644 include/configs/peach-pi.h
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig
b/arch/arm/cpu/armv7/exynos/Kconfig
index b6a558b..76c0faf 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -33,9 +33,12 @@ config TARGET_SNOW
config TARGET_SMDK5420
bool "SMDK5420 board"
-config TARGET_PEACH_PIT
+config TARGET_PEACH_PI
bool "Peach Pi board"
+config TARGET_PEACH_PIT
+ bool "Peach Pit board"
+
endchoice
config SYS_CPU
diff --git a/board/samsung/smdk5420/Kconfig b/board/samsung/smdk5420/Kconfig
index fb9bedd..b88722f 100644
--- a/board/samsung/smdk5420/Kconfig
+++ b/board/samsung/smdk5420/Kconfig
@@ -1,3 +1,19 @@
+if TARGET_PEACH_PI
+
+config SYS_BOARD
+ string
+ default "smdk5420"
+
+config SYS_VENDOR
+ string
+ default "samsung"
+
+config SYS_CONFIG_NAME
+ string
+ default "peach-pi"
+
+endif
+
if TARGET_PEACH_PIT
config SYS_BOARD
diff --git a/board/samsung/smdk5420/MAINTAINERS
b/board/samsung/smdk5420/MAINTAINERS
index c8241a8..25813d5 100644
--- a/board/samsung/smdk5420/MAINTAINERS
+++ b/board/samsung/smdk5420/MAINTAINERS
@@ -2,7 +2,9 @@ SMDK5420 BOARD
M: Akshay Saraswat <aksha...@samsung.com>
S: Maintained
F: board/samsung/smdk5420/
+F: include/configs/peach-pi.h
F: include/configs/peach-pit.h
+F: configs/peach-pi_defconfig
F: configs/peach-pit_defconfig
SMDK5420 BOARD
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
new file mode 100644
index 0000000..8cb3946
--- /dev/null
+++ b/configs/peach-pi_defconfig
@@ -0,0 +1,4 @@
+CONFIG_SPL=y
++S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
++S:CONFIG_TARGET_PEACH_PI=y
diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420.h
index d2a9556..b3be3e7 100644
--- a/include/configs/exynos5420.h
+++ b/include/configs/exynos5420.h
@@ -10,6 +10,7 @@
#define __CONFIG_EXYNOS5420_H
#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */
+#define CONFIG_EXYNOS5800 /* A variant of Exynos5420 (Exynos5
Family) */
#define MACH_TYPE_SMDK5420 8002
#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
@@ -27,7 +28,7 @@
#define CONFIG_SPL_MAX_FOOTPRINT (30 * 1024)
-#define CONFIG_DEVICE_TREE_LIST "exynos5420-peach-pit exynos5420-smdk5420"
+#define CONFIG_DEVICE_TREE_LIST "exynos5800-peach-pi exynos5420-peach-pit
exynos5420-smdk5420"
#define CONFIG_MAX_I2C_NUM 11
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
new file mode 100644
index 0000000..4517e0a
--- /dev/null
+++ b/include/configs/peach-pi.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * Configuration settings for the SAMSUNG/GOOGLE PEACH-PI board.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __CONFIG_PEACH_PI_H
+#define __CONFIG_PEACH_PI_H
+
+#include <configs/exynos5-dt.h>
+
+#include <configs/exynos5420.h>
+
+#undef CONFIG_DEFAULT_DEVICE_TREE
+#define CONFIG_DEFAULT_DEVICE_TREE exynos5800-peach-pi
+
+/* select serial console configuration */
+#define CONFIG_SERIAL3 /* use SERIAL 3 */
+
+#define CONFIG_SYS_PROMPT "Peach-Pi # "
+#define CONFIG_IDENT_STRING " for Peach-Pi"
+
+#define CONFIG_VIDEO_PARADE
+
+/* Display */
+#define CONFIG_LCD
+#ifdef CONFIG_LCD
+#define CONFIG_EXYNOS_FB
+#define CONFIG_EXYNOS_DP
+#define LCD_BPP LCD_COLOR16
+#endif
+
+#endif /* __CONFIG_PEACH_PI_H */
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 88c093f..92edea2 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -19,8 +19,8 @@
/* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */
-#define CONFIG_SYS_PROMPT "Peach # "
-#define CONFIG_IDENT_STRING " for Peach"
+#define CONFIG_SYS_PROMPT "Peach-Pit # "
+#define CONFIG_IDENT_STRING " for Peach-Pit"
#define CONFIG_VIDEO_PARADE
--
1.9.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
