* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
@ 2014-07-23 12:11 Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 1/8] exynos: Rename -dt config files to -common Simon Glass
` (8 more replies)
0 siblings, 9 replies; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
This series tries to unify the Samsung board configs into a few header
files for exynos5 and exynos5.
The purpose is to make it easier to move to driver model. In that case
I would like things like the GPIO drivers and serial drivers to work in
a standard way, and not need to support device tree and platform data at
the same time. That would be quite painful.
Another reason is that the Chrome OS EC drivers are currently included in
boards that don't have a Chrome OS EC. This concern was raised by the
Samsung maintainer (Minkyu) a while back.
There are still a few boards that don't use CONFIG_OF_CONTROL so I have
updated these with the most rudimentary of device tree files.
Unfortunately I don't have boards for most of these (for testing) and I
am hoping that the maintainers can come to the rescue and fix up any
patches that have problems. I am also worried that I have used a common
exynos file for things like smdkv310, when in fact they have some other
chip in common.
So maintainers, please can you test this and re-issue the patch, or make
comments on my attempts?
Simon Glass (8):
exynos: Rename -dt config files to -common
exynos: Move common exynos settings into a common file
exynos: Move common smdk5420 things to common file
exynos: config: Move cros_ec and tps65090 out of smdk boards
config: Move arndale to use common exynos5250 file
config: Move smdkv310 to use common exynos4 file
samsung: Move s5p_goni to use exynos-common config
samsung: Move smdkc100 to use exynos-common config
arch/arm/dts/Makefile | 3 +
arch/arm/dts/exynos4210-smdkv310.dts | 21 ++
arch/arm/dts/s5pc1xx-goni.dts | 21 ++
arch/arm/dts/s5pc1xx-smdkc100.dts | 21 ++
arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++
arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 +++++
drivers/mmc/s5p_sdhci.c | 2 -
include/configs/arndale.h | 212 ++-------------------
include/configs/{exynos4-dt.h => exynos-common.h} | 104 +++-------
include/configs/exynos4-common.h | 64 +++++++
include/configs/{exynos5-dt.h => exynos5-common.h} | 110 ++---------
include/configs/exynos5-dt-common.h | 35 ++++
.../{exynos5250-dt.h => exynos5250-common.h} | 5 +-
.../configs/{exynos5420.h => exynos5420-common.h} | 11 +-
include/configs/origen.h | 5 +-
include/configs/peach-pit.h | 8 +-
include/configs/s5p_goni.h | 55 +-----
include/configs/s5pc210_universal.h | 5 +-
include/configs/smdk5250.h | 6 +-
include/configs/smdk5420.h | 7 +-
include/configs/smdkc100.h | 57 ++----
include/configs/smdkv310.h | 65 ++-----
include/configs/snow.h | 8 +-
include/configs/trats.h | 6 +-
include/configs/trats2.h | 6 +-
25 files changed, 390 insertions(+), 558 deletions(-)
create mode 100644 arch/arm/dts/exynos4210-smdkv310.dts
create mode 100644 arch/arm/dts/s5pc1xx-goni.dts
create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts
create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h
create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h
rename include/configs/{exynos4-dt.h => exynos-common.h} (54%)
create mode 100644 include/configs/exynos4-common.h
rename include/configs/{exynos5-dt.h => exynos5-common.h} (70%)
create mode 100644 include/configs/exynos5-dt-common.h
rename include/configs/{exynos5250-dt.h => exynos5250-common.h} (92%)
rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)
--
2.0.0.526.g5318336
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 1/8] exynos: Rename -dt config files to -common
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 2/8] exynos: Move common exynos settings into a common file Simon Glass
` (7 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
We want exynos5250-dt.h to be a board which can support any exynos5250
device. This matches the naming used by Linux. As a first step, rename
the existing -dt files to -common to make it clear they are common files,
and not specific boards.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/configs/{exynos4-dt.h => exynos4-common.h} | 6 +++---
include/configs/{exynos5-dt.h => exynos5-common.h} | 6 +++---
include/configs/{exynos5250-dt.h => exynos5250-common.h} | 2 +-
include/configs/origen.h | 2 +-
include/configs/peach-pit.h | 2 +-
include/configs/s5pc210_universal.h | 2 +-
include/configs/smdk5250.h | 2 +-
include/configs/smdk5420.h | 2 +-
include/configs/snow.h | 2 +-
include/configs/trats.h | 2 +-
include/configs/trats2.h | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
rename include/configs/{exynos4-dt.h => exynos4-common.h} (97%)
rename include/configs/{exynos5-dt.h => exynos5-common.h} (98%)
rename include/configs/{exynos5250-dt.h => exynos5250-common.h} (97%)
diff --git a/include/configs/exynos4-dt.h b/include/configs/exynos4-common.h
similarity index 97%
rename from include/configs/exynos4-dt.h
rename to include/configs/exynos4-common.h
index 44e6ab4..24ee2d5 100644
--- a/include/configs/exynos4-dt.h
+++ b/include/configs/exynos4-common.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __CONFIG_EXYNOS4_COMMON_H
+#define __CONFIG_EXYNOS4_COMMON_H
/* High Level Configuration Options */
#define CONFIG_SAMSUNG /* in a SAMSUNG core */
@@ -138,4 +138,4 @@
/* Enable devicetree support */
#define CONFIG_OF_LIBFDT
-#endif /* __CONFIG_H */
+#endif /* __CONFIG_EXYNOS4_COMMON_H */
diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-common.h
similarity index 98%
rename from include/configs/exynos5-dt.h
rename to include/configs/exynos5-common.h
index 3c2036e..7f66a46 100644
--- a/include/configs/exynos5-dt.h
+++ b/include/configs/exynos5-common.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __CONFIG_EXYNOS5_COMMON_H
+#define __CONFIG_EXYNOS5_COMMON_H
/* High Level Configuration Options */
#define CONFIG_SAMSUNG /* in a SAMSUNG core */
@@ -294,4 +294,4 @@
#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002
#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
-#endif /* __CONFIG_H */
+#endif /* __CONFIG_EXYNOS5_COMMON_H */
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-common.h
similarity index 97%
rename from include/configs/exynos5250-dt.h
rename to include/configs/exynos5250-common.h
index 05d33a7..b4c1ccf 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-common.h
@@ -10,7 +10,7 @@
#ifndef __CONFIG_5250_H
#define __CONFIG_5250_H
-#include <configs/exynos5-dt.h>
+#include <configs/exynos5-common.h>
#define CONFIG_EXYNOS5250
#define CONFIG_SYS_SDRAM_BASE 0x40000000
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 8258338..cd22723 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_ORIGEN_H
#define __CONFIG_ORIGEN_H
-#include <configs/exynos4-dt.h>
+#include <configs/exynos4-common.h>
#define CONFIG_SYS_PROMPT "ORIGEN # "
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index cfd4d5c..59192e1 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_PEACH_PIT_H
#define __CONFIG_PEACH_PIT_H
-#include <configs/exynos5-dt.h>
+#include <configs/exynos5-common.h>
#include <configs/exynos5420.h>
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 20985da..066fc02 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -10,7 +10,7 @@
#ifndef __CONFIG_UNIVERSAL_H
#define __CONFIG_UNIVERSAL_H
-#include <configs/exynos4-dt.h>
+#include <configs/exynos4-common.h>
#define CONFIG_SYS_PROMPT "Universal # " /* Monitor Command Prompt */
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 66fa179..751b5eb 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_SMDK_H
#define __CONFIG_SMDK_H
-#include <configs/exynos5250-dt.h>
+#include <configs/exynos5250-common.h>
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 606739b..43c9808 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_SMDK5420_H
#define __CONFIG_SMDK5420_H
-#include <configs/exynos5-dt.h>
+#include <configs/exynos5-common.h>
#include <configs/exynos5420.h>
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 673fa14..78adca8 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -9,7 +9,7 @@
#ifndef __CONFIG_SNOW_H
#define __CONFIG_SNOW_H
-#include <configs/exynos5250-dt.h>
+#include <configs/exynos5250-common.h>
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 35c1feb..e3263cc 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -10,7 +10,7 @@
#ifndef __CONFIG_TRATS_H
#define __CONFIG_TRATS_H
-#include <configs/exynos4-dt.h>
+#include <configs/exynos4-common.h>
#define CONFIG_SYS_PROMPT "Trats # " /* Monitor Command Prompt */
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 94c8a9f..d0b00c0 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -11,7 +11,7 @@
#ifndef __CONFIG_TRATS2_H
#define __CONFIG_TRATS2_H
-#include <configs/exynos4-dt.h>
+#include <configs/exynos4-common.h>
#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 2/8] exynos: Move common exynos settings into a common file
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 1/8] exynos: Rename -dt config files to -common Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to " Simon Glass
` (6 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
Since exynos4 and exyno5 share many settings, we should move these into
a common file to avoid duplication.
Effective changes are:
- All exynos boards now have EXT4 and FAT write support - this affects
exynos5250 and exynos5420 which previously did not. This also disables
the ext2 commands which are equivalent to ext4 anyway.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/configs/exynos-common.h | 93 +++++++++++++++++++++++++++++++++++++
include/configs/exynos4-common.h | 81 +-------------------------------
include/configs/exynos5-common.h | 90 +++++------------------------------
include/configs/origen.h | 3 --
include/configs/s5pc210_universal.h | 3 --
include/configs/smdk5250.h | 4 --
include/configs/snow.h | 4 --
include/configs/trats.h | 4 --
include/configs/trats2.h | 4 --
9 files changed, 107 insertions(+), 179 deletions(-)
create mode 100644 include/configs/exynos-common.h
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
new file mode 100644
index 0000000..0308b88
--- /dev/null
+++ b/include/configs/exynos-common.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2013 Samsung Electronics
+ *
+ * Common configuration settings for the SAMSUNG EXYNOS boards.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __EXYNOS_COMMON_H
+#define __EXYNOS_COMMON_H
+
+/* High Level Configuration Options */
+#define CONFIG_SAMSUNG /* in a SAMSUNG core */
+#define CONFIG_S5P /* S5P Family */
+
+#include <asm/arch/cpu.h> /* get chip and board defs */
+#include <linux/sizes.h>
+
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_BOARD_COMMON
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/* Enable fdt support */
+#define CONFIG_OF_CONTROL
+#define CONFIG_OF_SEPARATE
+#define CONFIG_OF_LIBFDT
+
+/* Keep L2 Cache Disabled */
+#define CONFIG_CMD_CACHE
+
+/* input clock of PLL: 24MHz input clock */
+#define CONFIG_SYS_CLK_FREQ 24000000
+
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_INITRD_TAG
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_ENV_OVERWRITE
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
+
+/* select serial console configuration */
+#define CONFIG_BAUDRATE 115200
+
+/* SD/MMC configuration */
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC
+#define CONFIG_S5P_SDHCI
+#define CONFIG_SDHCI
+#define CONFIG_DWMMC
+#define CONFIG_EXYNOS_DWMMC
+#define CONFIG_BOUNCE_BUFFER
+
+#define CONFIG_BOOTDELAY 3
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+
+/* PWM */
+#define CONFIG_PWM
+
+/* Command definition*/
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
+#define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+#define CONFIG_CMD_PART
+#define CONFIG_PARTITION_UUIDS
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_LONGHELP /* undef to save memory */
+#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
+#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
+#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
+#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
+
+/* Boot Argument Buffer Size */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+/* FLASH and environment organization */
+#define CONFIG_SYS_NO_FLASH
+#undef CONFIG_CMD_IMLS
+
+#endif /* __CONFIG_H */
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 24ee2d5..dc91e0e 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -9,85 +9,29 @@
#ifndef __CONFIG_EXYNOS4_COMMON_H
#define __CONFIG_EXYNOS4_COMMON_H
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG /* in a SAMSUNG core */
-#define CONFIG_S5P /* S5P Family */
-#define CONFIG_EXYNOS4 /* which is in a Exynos4 Family */
+#define CONFIG_EXYNOS4 /* Exynos4 Family */
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_COMMON
-#define CONFIG_SYS_GENERIC_BOARD
-
-/* Enable fdt support */
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
+#include "exynos-common.h"
#define CONFIG_SYS_CACHELINE_SIZE 32
-
-/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
#define CONFIG_REVISION_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-#include <linux/sizes.h>
/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_S5P_SDHCI
-#define CONFIG_SDHCI
#define CONFIG_MMC_SDMA
-#define CONFIG_DWMMC
-#define CONFIG_EXYNOS_DWMMC
-#define CONFIG_BOUNCE_BUFFER
#define CONFIG_MMC_DEFAULT_DEV 0
-/* PWM */
-#define CONFIG_PWM
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Command definition*/
-#include <config_cmd_default.h>
-
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_MISC
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_XIMG
-#undef CONFIG_CMD_CACHE
#undef CONFIG_CMD_ONENAND
#undef CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_MMC
#define CONFIG_CMD_DFU
#define CONFIG_CMD_GPT
#define CONFIG_CMD_PMIC
#define CONFIG_CMD_SETEXPR
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-/* FAT */
-#define CONFIG_CMD_FAT
-#define CONFIG_FAT_WRITE
-
-/* EXT4 */
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-
/* USB Composite download gadget - g_dnl */
#define CONFIG_USBDOWNLOAD_GADGET
@@ -107,26 +51,8 @@
#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
#define CONFIG_G_DNL_MANUFACTURER "Samsung"
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
-
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_S3C_UDC_OTG
#define CONFIG_USB_GADGET_DUALSPEED
@@ -135,7 +61,4 @@
#define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USB_GADGET_MASS_STORAGE
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
#endif /* __CONFIG_EXYNOS4_COMMON_H */
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 7f66a46..b745f6a 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -9,25 +9,14 @@
#ifndef __CONFIG_EXYNOS5_COMMON_H
#define __CONFIG_EXYNOS5_COMMON_H
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG /* in a SAMSUNG core */
-#define CONFIG_S5P /* S5P Family */
-#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
-
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_COMMON
+#define CONFIG_EXYNOS5 /* Exynos5 Family */
+
+#include "exynos-common.h"
+
+#define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_EXYNOS_SPL
-/* Enable fdt support for Exynos5250 */
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
/* Allow tracing to be enabled */
#define CONFIG_TRACE
#define CONFIG_CMD_TRACE
@@ -36,22 +25,11 @@
#define CONFIG_TRACE_EARLY
#define CONFIG_TRACE_EARLY_ADDR 0x50000000
-/* Keep L2 Cache Disabled */
-#define CONFIG_SYS_CACHELINE_SIZE 64
-#define CONFIG_CMD_CACHE
/* Enable ACE acceleration for SHA1 and SHA256 */
#define CONFIG_EXYNOS_ACE_SHA
#define CONFIG_SHA_HW_ACCEL
-/* input clock of PLL: SMDK5250 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
/* Power Down Modes */
#define S5P_CHECK_SLEEP 0x00000BAD
#define S5P_CHECK_DIDLE 0xBAD00000
@@ -63,13 +41,12 @@
#define INFORM2_OFFSET 0x808
#define INFORM3_OFFSET 0x80c
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
-
/* select serial console configuration */
#define CONFIG_BAUDRATE 115200
#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
#define CONFIG_SILENT_CONSOLE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_CONSOLE_MUX
/* Enable keyboard */
#define CONFIG_CROS_EC /* CROS_EC protocol */
@@ -78,8 +55,6 @@
#define CONFIG_KEYBOARD
/* Console configuration */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define EXYNOS_DEVICE_SETTINGS \
"stdin=serial,cros-ec-keyb\0" \
"stdout=serial,lcd\0" \
@@ -88,39 +63,11 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
EXYNOS_DEVICE_SETTINGS
-/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-#define CONFIG_DWMMC
-#define CONFIG_EXYNOS_DWMMC
-#define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* PWM */
-#define CONFIG_PWM
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Command definition*/
-#include <config_cmd_default.h>
-
#define CONFIG_CMD_PING
#define CONFIG_CMD_ELF
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
#define CONFIG_CMD_NET
#define CONFIG_CMD_HASH
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
/* Thermal Management Unit */
#define CONFIG_EXYNOS_TMU
#define CONFIG_CMD_DTT
@@ -136,6 +83,7 @@
/* MMC SPL */
#define CONFIG_SPL
#define COPY_BL2_FNPTR_ADDR 0x02020030
+#define CONFIG_SUPPORT_EMMC_BOOT
#define CONFIG_SPL_LIBCOMMON_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
@@ -144,14 +92,8 @@
#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
@@ -178,10 +120,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x00000000
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SECURE_BL1_ONLY
@@ -214,11 +152,6 @@
#define EXYNOS_COPY_SPI_FNPTR_ADDR 0x02020058
#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
-
/* I2C */
#define CONFIG_SYS_I2C_INIT_BOARD
#define CONFIG_SYS_I2C
@@ -272,9 +205,6 @@
#define CONFIG_MENU
#endif
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
/* SHA hashing */
#define CONFIG_CMD_HASH
#define CONFIG_HASH_VERIFY
@@ -294,4 +224,8 @@
#define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002
#define EXYNOS_IRAM_SECONDARY_BASE 0x02020018
+/* Enable FIT support and comparison */
+#define CONFIG_FIT
+#define CONFIG_FIT_BEST_MATCH
+
#endif /* __CONFIG_EXYNOS5_COMMON_H */
diff --git a/include/configs/origen.h b/include/configs/origen.h
index cd22723..13bed28 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -37,9 +37,6 @@
#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 066fc02..cd4cdfe 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -29,9 +29,6 @@
#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 751b5eb..37dc092 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -14,8 +14,4 @@
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250
-/* Enable FIT support and comparison */
-#define CONFIG_FIT
-#define CONFIG_FIT_BEST_MATCH
-
#endif /* __CONFIG_SMDK_H */
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 78adca8..58b011d 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -14,8 +14,4 @@
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow
-/* Enable FIT support and comparison */
-#define CONFIG_FIT
-#define CONFIG_FIT_BEST_MATCH
-
#endif /* __CONFIG_SNOW_H */
diff --git a/include/configs/trats.h b/include/configs/trats.h
index e3263cc..933cda5 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -41,10 +41,6 @@
#define CONFIG_SYS_TEXT_BASE 0x63300000
-#include <linux/sizes.h>
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index d0b00c0..1c1297b 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -38,10 +38,6 @@
#define CONFIG_SYS_TEXT_BASE 0x43e00000
-#include <linux/sizes.h>
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to common file
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 1/8] exynos: Rename -dt config files to -common Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 2/8] exynos: Move common exynos settings into a common file Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-09-11 7:38 ` Minkyu Kang
2014-07-23 12:11 ` [U-Boot] [PATCH 4/8] exynos: config: Move cros_ec and tps65090 out of smdk boards Simon Glass
` (5 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
A few things are common but are not in the common file. Fix this and
rename the file to fit with the other exynos*-common files.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++-----
include/configs/peach-pit.h | 7 +------
include/configs/smdk5420.h | 7 +------
3 files changed, 8 insertions(+), 17 deletions(-)
rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)
diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h
similarity index 88%
rename from include/configs/exynos5420.h
rename to include/configs/exynos5420-common.h
index d2a9556..685f9c1 100644
--- a/include/configs/exynos5420.h
+++ b/include/configs/exynos5420-common.h
@@ -9,7 +9,9 @@
#ifndef __CONFIG_EXYNOS5420_H
#define __CONFIG_EXYNOS5420_H
-#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */
+#define CONFIG_EXYNOS5420
+
+#include <configs/exynos5-common.h>
#define MACH_TYPE_SMDK5420 8002
#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
@@ -31,10 +33,6 @@
#define CONFIG_MAX_I2C_NUM 11
-/* Enable FIT support and comparison */
-#define CONFIG_FIT
-#define CONFIG_FIT_BEST_MATCH
-
#define CONFIG_BOARD_REV_GPIO_COUNT 2
#define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000"
@@ -49,4 +47,7 @@
#define CONFIG_NR_DRAM_BANKS 7
#define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */
+/* select serial console configuration */
+#define CONFIG_SERIAL3 /* use SERIAL 3 */
+
#endif /* __CONFIG_EXYNOS5420_H */
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 59192e1..407f10f 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -9,16 +9,11 @@
#ifndef __CONFIG_PEACH_PIT_H
#define __CONFIG_PEACH_PIT_H
-#include <configs/exynos5-common.h>
-
-#include <configs/exynos5420.h>
+#include <configs/exynos5420-common.h>
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit
-/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
-
#define CONFIG_SYS_PROMPT "Peach # "
#define CONFIG_IDENT_STRING " for Peach"
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 43c9808..83abc13 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -9,18 +9,13 @@
#ifndef __CONFIG_SMDK5420_H
#define __CONFIG_SMDK5420_H
-#include <configs/exynos5-common.h>
-
-#include <configs/exynos5420.h>
+#include <configs/exynos5420-common.h>
#define CONFIG_SMDK5420 /* which is in a SMDK5420 */
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420
-/* select serial console configuration */
-#define CONFIG_SERIAL3 /* use SERIAL 3 */
-
#define CONFIG_SYS_PROMPT "SMDK5420 # "
#define CONFIG_IDENT_STRING " for SMDK5420"
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 4/8] exynos: config: Move cros_ec and tps65090 out of smdk boards
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (2 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to " Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file Simon Glass
` (4 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
These boards do not in fact have a Chrome OS EC, nor a TPS565090 PMIC, so
move the settings into a separate common file to be used by those that need
it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/configs/exynos5-common.h | 18 +++---------------
include/configs/exynos5-dt-common.h | 35 +++++++++++++++++++++++++++++++++++
include/configs/exynos5250-common.h | 3 ---
include/configs/peach-pit.h | 1 +
include/configs/snow.h | 4 ++++
5 files changed, 43 insertions(+), 18 deletions(-)
create mode 100644 include/configs/exynos5-dt-common.h
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index b745f6a..8f7c4b7 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -48,17 +48,10 @@
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_CONSOLE_MUX
-/* Enable keyboard */
-#define CONFIG_CROS_EC /* CROS_EC protocol */
-#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */
-#define CONFIG_CMD_CROS_EC
-#define CONFIG_KEYBOARD
-
-/* Console configuration */
#define EXYNOS_DEVICE_SETTINGS \
- "stdin=serial,cros-ec-keyb\0" \
- "stdout=serial,lcd\0" \
- "stderr=serial,lcd\0"
+ "stdin=serial\0" \
+ "stdout=serial\0" \
+ "stderr=serial\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
EXYNOS_DEVICE_SETTINGS
@@ -186,11 +179,6 @@
#define CONFIG_ENV_SPI_MAX_HZ 50000000
#endif
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-#define CONFIG_POWER_TPS65090
-
/* Ethernet Controllor Driver */
#ifdef CONFIG_CMD_NET
#define CONFIG_SMC911X
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
new file mode 100644
index 0000000..66547fa
--- /dev/null
+++ b/include/configs/exynos5-dt-common.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Google, Inc
+ *
+ * Configuration settings for generic Exynos 5 board
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __CONFIG_EXYNOS5_DT_COMMON_H
+#define __CONFIG_EXYNOS5_DT_COMMON_H
+
+#include "exynos5-common.h"
+
+/* PMIC */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_TPS65090
+
+/* Enable keyboard */
+#define CONFIG_CROS_EC /* CROS_EC protocol */
+#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */
+#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
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index b4c1ccf..987eb15 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -22,8 +22,6 @@
#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
-#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */
-
/* USB */
#define CONFIG_CMD_USB
#define CONFIG_USB_XHCI
@@ -44,7 +42,6 @@
/* PMIC */
#define CONFIG_POWER_MAX77686
-#define CONFIG_POWER_TPS65090_I2C
/* Sound */
#define CONFIG_CMD_SOUND
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 407f10f..6a41a6e 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -10,6 +10,7 @@
#define __CONFIG_PEACH_PIT_H
#include <configs/exynos5420-common.h>
+#include <configs/exynos5-dt-common.h>
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 58b011d..93a03b1 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -10,8 +10,12 @@
#define __CONFIG_SNOW_H
#include <configs/exynos5250-common.h>
+#include <configs/exynos5-dt-common.h>
#undef CONFIG_DEFAULT_DEVICE_TREE
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow
+#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */
+#define CONFIG_POWER_TPS65090_I2C
+
#endif /* __CONFIG_SNOW_H */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (3 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 4/8] exynos: config: Move cros_ec and tps65090 out of smdk boards Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-09-11 7:38 ` Minkyu Kang
2014-07-23 12:11 ` [U-Boot] [PATCH 6/8] config: Move smdkv310 to use common exynos4 file Simon Glass
` (3 subsequent siblings)
8 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
Most of the arndale features are common with other exynos5250 boards. To
permit easier addition of driver model support, use the common file.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/configs/arndale.h | 212 +++-------------------------------------------
1 file changed, 14 insertions(+), 198 deletions(-)
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 370db82..1f0bec9 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -9,219 +9,55 @@
#ifndef __CONFIG_ARNDALE_H
#define __CONFIG_ARNDALE_H
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG /* in a SAMSUNG core */
-#define CONFIG_S5P /* S5P Family */
-#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
-#define CONFIG_EXYNOS5250
-
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
-/* Allow tracing to be enabled */
-#define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
-#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
-#define CONFIG_TRACE_EARLY_SIZE (8 << 20)
-#define CONFIG_TRACE_EARLY
-#define CONFIG_TRACE_EARLY_ADDR 0x50000000
-
-/* Keep L2 Cache Disabled */
-#define CONFIG_SYS_DCACHE_OFF
-
-#define CONFIG_SYS_SDRAM_BASE 0x40000000
-#define CONFIG_SYS_TEXT_BASE 0x43E00000
-
-/* input clock of PLL: SMDK5250 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/* Power Down Modes */
-#define S5P_CHECK_SLEEP 0x00000BAD
-#define S5P_CHECK_DIDLE 0xBAD00000
-#define S5P_CHECK_LPA 0xABAD0000
-
-/* Offset for inform registers */
-#define INFORM0_OFFSET 0x800
-#define INFORM1_OFFSET 0x804
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
-
-/* select serial console configuration */
-#define CONFIG_BAUDRATE 115200
-#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
-#define CONFIG_SILENT_CONSOLE
-
-/* Console configuration */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define EXYNOS_DEVICE_SETTINGS \
- "stdin=serial\0" \
- "stdout=serial\0" \
- "stderr=serial\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- EXYNOS_DEVICE_SETTINGS
+#include "exynos5250-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-#define CONFIG_DWMMC
-#define CONFIG_EXYNOS_DWMMC
#define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
-
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* PWM */
-#define CONFIG_PWM
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-/* Command definition*/
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_MMC
#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_HASH
-
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
/* USB */
-#define CONFIG_CMD_USB
+#undef CONFIG_USB_XHCI
+#undef CONFIG_USB_XHCI_EXYNOS
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_EXYNOS
-#define CONFIG_USB_STORAGE
+#undef CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
/* MMC SPL */
#define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL
-#define COPY_BL2_FNPTR_ADDR 0x02020030
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-
-/* specific .lds file */
-#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
-#define CONFIG_SPL_TEXT_BASE 0x02023400
-#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
-
-#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
+#undef CONFIG_SYS_PROMPT
#define CONFIG_SYS_PROMPT "ARNDALE # "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
+#undef CONFIG_DEFAULT_CONSOLE
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
-#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
-#define CONFIG_RD_LVL
#define CONFIG_NR_DRAM_BANKS 8
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
-#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
-#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
-#define PHYS_SDRAM_2_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3 (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_3_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4 (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5 (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_5_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6 (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_6_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7 (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_7_SIZE SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE
-
-#define CONFIG_SYS_MONITOR_BASE 0x00000000
-
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING " for ARNDALE"
-#define CONFIG_SYS_MMC_ENV_DEV 0
+#undef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING " for ARNDALE"
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SECURE_BL1_ONLY
-
-/* Secure FW size configuration */
-#ifdef CONFIG_SECURE_BL1_ONLY
-#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
-#else
-#define CONFIG_SEC_FW_SIZE 0
-#endif
-
-/* Configuration of BL1, BL2, ENV Blocks on mmc */
-#define CONFIG_RES_BLOCK_SIZE (512)
-#define CONFIG_BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
-#define CONFIG_BL2_SIZE (512UL << 10UL) /* 512 KB */
-#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
-
-#define CONFIG_BL1_OFFSET (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
-#define CONFIG_BL2_OFFSET (CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
-#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
-
-/* U-boot copy size from boot Media to DRAM.*/
-#define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512)
-#define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512)
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
+#undef CONFIG_ENV_OFFSET
+#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
#define CONFIG_IRAM_STACK 0x02050000
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
-/* I2C */
-#define CONFIG_SYS_I2C_INIT_BOARD
-#define CONFIG_SYS_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 /* 100 Kbps */
-#define CONFIG_SYS_I2C_S3C24X0
-#define CONFIG_MAX_I2C_NUM 8
-#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
-#define CONFIG_I2C_EDID
-
/* PMIC */
#define CONFIG_PMIC
#define CONFIG_POWER_I2C
@@ -231,24 +67,4 @@
#define CONFIG_PREBOOT
-/* Ethernet Controllor Driver */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_BASE 0x5000000
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_ENV_SROM_BANK 1
-#endif /*CONFIG_CMD_NET*/
-
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#endif
-
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
-/* Enable Time Command */
-#define CONFIG_CMD_TIME
-
#endif /* __CONFIG_H */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 6/8] config: Move smdkv310 to use common exynos4 file
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (4 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config Simon Glass
` (2 subsequent siblings)
8 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
Most of the smdkv310 features are common with other exynos4 boards. To
permit easier addition of driver model support, use the common file and
add a device tree file.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/exynos4210-smdkv310.dts | 21 ++++++++++++
include/configs/smdkv310.h | 65 ++++++++----------------------------
3 files changed, 36 insertions(+), 51 deletions(-)
create mode 100644 arch/arm/dts/exynos4210-smdkv310.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6e2e313..3b760ff 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1,4 +1,5 @@
dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
+ exynos4210-smdkv310.dtb \
exynos4210-universal_c210.dtb \
exynos4210-trats.dtb \
exynos4412-trats2.dtb
diff --git a/arch/arm/dts/exynos4210-smdkv310.dts b/arch/arm/dts/exynos4210-smdkv310.dts
new file mode 100644
index 0000000..c390c8f
--- /dev/null
+++ b/arch/arm/dts/exynos4210-smdkv310.dts
@@ -0,0 +1,21 @@
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+ model = "Samsung SMDKV310 on Exynos4210";
+ compatible = "samsung,smdkv310", "samsung,exynos4210";
+
+ aliases {
+ serial0 = "/serial at 13800000";
+ console = "/serial at 13820000";
+ };
+
+};
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 34adfaf..7c1bb33 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -9,71 +9,43 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include "exynos4-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
+#undef CONFIG_USB_GADGET
+#undef CONFIG_USB_GADGET_S3C_UDC_OTG
+#undef CONFIG_CMD_USB_MASS_STORAGE
+#undef CONFIG_REVISION_TAG
+#undef CONFIG_CMD_THOR_DOWNLOAD
+#undef CONFIG_CMD_DFU
+
/* High Level Configuration Options */
-#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
-#define CONFIG_S5P 1 /* S5P Family */
-#define CONFIG_EXYNOS4 /* EXYNOS4 Family */
#define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */
#define CONFIG_SMDKV310 1 /* working with SMDKV310*/
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_EARLY_INIT_F
-
/* Mach Type */
#define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310
#define CONFIG_SYS_SDRAM_BASE 0x40000000
#define CONFIG_SYS_TEXT_BASE 0x43E00000
-/* input clock of PLL: SMDKV310 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
/* Handling Sleep Mode*/
#define S5P_CHECK_SLEEP 0x00000BAD
#define S5P_CHECK_DIDLE 0xBAD00000
#define S5P_CHECK_LPA 0xABAD0000
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))
-
/* select serial console configuration */
#define CONFIG_SERIAL1 1 /* use SERIAL 1 */
-#define CONFIG_BAUDRATE 115200
#define EXYNOS4_DEFAULT_UART_OFFSET 0x010000
-/* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-
-/* PWM */
-#define CONFIG_PWM 1
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-/* Command definition*/
-#include <config_cmd_default.h>
-
#define CONFIG_CMD_PING
#define CONFIG_CMD_ELF
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MMC
#define CONFIG_CMD_NET
-#define CONFIG_CMD_FAT
-
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
/* MMC SPL */
#define CONFIG_SPL
@@ -85,15 +57,8 @@
#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT "SMDKV310 # "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size*/
-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x6000000)
@@ -112,8 +77,6 @@
#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH 1
-#undef CONFIG_CMD_IMLS
#define CONFIG_IDENT_STRING " for SMDKC210/V310"
#define CONFIG_CLK_1000_400_200
@@ -127,7 +90,6 @@
#define RESERVE_BLOCK_SIZE (512)
#define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
#define CONFIG_ENV_OFFSET (RESERVE_BLOCK_SIZE + BL1_SIZE)
-#define CONFIG_DOS_PARTITION 1
#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
@@ -147,6 +109,7 @@
#define CONFIG_ENV_SROM_BANK 1
#endif /*CONFIG_CMD_NET*/
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
+#undef CONFIG_DEFAULT_DEVICE_TREE
+#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-smdkv310
+
#endif /* __CONFIG_H */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (5 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 6/8] config: Move smdkv310 to use common exynos4 file Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-09-09 10:26 ` Przemyslaw Marczak
2014-07-23 12:11 ` [U-Boot] [PATCH 8/8] samsung: Move smdkc100 " Simon Glass
2014-07-24 8:34 ` [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Lukasz Majewski
8 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
Change this board to use the exynos common config and add a device tree.
This also adds a pinmux header file - but it is just a copy of the exynos
one so may be incorrect.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/s5pc1xx-goni.dts | 21 ++++++++++
arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++++++++++++++++++++++++++
arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 ++++++++++++++++++++++++
drivers/mmc/s5p_sdhci.c | 2 -
include/configs/s5p_goni.h | 55 +++++----------------------
6 files changed, 143 insertions(+), 47 deletions(-)
create mode 100644 arch/arm/dts/s5pc1xx-goni.dts
create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h
create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 3b760ff..6a6e664 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
exynos4210-smdkv310.dtb \
exynos4210-universal_c210.dtb \
diff --git a/arch/arm/dts/s5pc1xx-goni.dts b/arch/arm/dts/s5pc1xx-goni.dts
new file mode 100644
index 0000000..c390c8f
--- /dev/null
+++ b/arch/arm/dts/s5pc1xx-goni.dts
@@ -0,0 +1,21 @@
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+ model = "Samsung SMDKV310 on Exynos4210";
+ compatible = "samsung,smdkv310", "samsung,exynos4210";
+
+ aliases {
+ serial0 = "/serial at 13800000";
+ console = "/serial at 13820000";
+ };
+
+};
diff --git a/arch/arm/include/asm/arch-s5pc1xx/periph.h b/arch/arm/include/asm/arch-s5pc1xx/periph.h
new file mode 100644
index 0000000..5c1c3d4
--- /dev/null
+++ b/arch/arm/include/asm/arch-s5pc1xx/periph.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics
+ * Rajeshwari Shinde <rajeshwari.s@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __ASM_ARM_ARCH_PERIPH_H
+#define __ASM_ARM_ARCH_PERIPH_H
+
+/*
+ * Peripherals required for pinmux configuration. List will
+ * grow with support for more devices getting added.
+ * Numbering based on interrupt table.
+ *
+ */
+enum periph_id {
+ PERIPH_ID_UART0 = 51,
+ PERIPH_ID_UART1,
+ PERIPH_ID_UART2,
+ PERIPH_ID_UART3,
+ PERIPH_ID_I2C0 = 56,
+ PERIPH_ID_I2C1,
+ PERIPH_ID_I2C2,
+ PERIPH_ID_I2C3,
+ PERIPH_ID_I2C4,
+ PERIPH_ID_I2C5,
+ PERIPH_ID_I2C6,
+ PERIPH_ID_I2C7,
+ PERIPH_ID_SPI0 = 68,
+ PERIPH_ID_SPI1,
+ PERIPH_ID_SPI2,
+ PERIPH_ID_SDMMC0 = 75,
+ PERIPH_ID_SDMMC1,
+ PERIPH_ID_SDMMC2,
+ PERIPH_ID_SDMMC3,
+ PERIPH_ID_I2C8 = 87,
+ PERIPH_ID_I2C9,
+ PERIPH_ID_I2S0 = 98,
+ PERIPH_ID_I2S1 = 99,
+
+ /* Since following peripherals do
+ * not have shared peripheral interrupts (SPIs)
+ * they are numbered arbitiraly after the maximum
+ * SPIs Exynos has (128)
+ */
+ PERIPH_ID_SROMC = 128,
+ PERIPH_ID_SPI3,
+ PERIPH_ID_SPI4,
+ PERIPH_ID_SDMMC4,
+ PERIPH_ID_PWM0,
+ PERIPH_ID_PWM1,
+ PERIPH_ID_PWM2,
+ PERIPH_ID_PWM3,
+ PERIPH_ID_PWM4,
+ PERIPH_ID_I2C10 = 203,
+
+ PERIPH_ID_NONE = -1,
+};
+
+#endif /* __ASM_ARM_ARCH_PERIPH_H */
diff --git a/arch/arm/include/asm/arch-s5pc1xx/pinmux.h b/arch/arm/include/asm/arch-s5pc1xx/pinmux.h
new file mode 100644
index 0000000..0b91ef6
--- /dev/null
+++ b/arch/arm/include/asm/arch-s5pc1xx/pinmux.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics
+ * Abhilash Kesavan <a.kesavan@samsung.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __ASM_ARM_ARCH_PINMUX_H
+#define __ASM_ARM_ARCH_PINMUX_H
+
+#include "periph.h"
+
+/*
+ * Flags for setting specific configarations of peripherals.
+ * List will grow with support for more devices getting added.
+ */
+enum {
+ PINMUX_FLAG_NONE = 0x00000000,
+
+ /* Flags for eMMC */
+ PINMUX_FLAG_8BIT_MODE = 1 << 0, /* SDMMC 8-bit mode */
+
+ /* Flags for SROM controller */
+ PINMUX_FLAG_BANK = 3 << 0, /* bank number (0-3) */
+ PINMUX_FLAG_16BIT = 1 << 2, /* 16-bit width */
+};
+
+/**
+ * Configures the pinmux for a particular peripheral.
+ *
+ * Each gpio can be configured in many different ways (4 bits on exynos)
+ * such as "input", "output", "special function", "external interrupt"
+ * etc. This function will configure the peripheral pinmux along with
+ * pull-up/down and drive strength.
+ *
+ * @param peripheral peripheral to be configured
+ * @param flags configure flags
+ * @return 0 if ok, -1 on error (e.g. unsupported peripheral)
+ */
+int exynos_pinmux_config(int peripheral, int flags);
+
+/**
+ * Decode the peripheral id using the interrpt numbers.
+ *
+ * @param blob Device tree blob
+ * @param node FDT I2C node to find
+ * @return peripheral id if ok, PERIPH_ID_NONE on error
+ */
+int pinmux_decode_periph_id(const void *blob, int node);
+#endif
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 2ff0ec2..637dd97 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -14,9 +14,7 @@
#include <asm/arch/mmc.h>
#include <asm/arch/clk.h>
#include <errno.h>
-#ifdef CONFIG_OF_CONTROL
#include <asm/arch/pinmux.h>
-#endif
static char *S5P_NAME = "SAMSUNG SDHCI";
static void s5p_sdhci_set_control_reg(struct sdhci_host *host)
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 6e795bf..9b79f05 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -11,54 +11,31 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include "exynos-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
+#undef CONFIG_BOARD_EARLY_INIT_F
+
/* High Level Configuration Options */
-#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
-#define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC110 1 /* which is in a S5PC110 */
#define CONFIG_MACH_GONI 1 /* working with Goni */
-#include <linux/sizes.h>
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-/* input clock of PLL: has 24MHz input clock at S5PC110 */
-#define CONFIG_SYS_CLK_FREQ_C110 24000000
-
/* DRAM Base */
#define CONFIG_SYS_SDRAM_BASE 0x30000000
/* Text Base */
#define CONFIG_SYS_TEXT_BASE 0x34800000
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
#define CONFIG_REVISION_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-/* Size of malloc() pool.*/
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 80 * SZ_1M)
+#undef CONFIG_EXYNOS_DWMMC
+#define SDHCI_MAX_HOSTS 2
/*
* select serial console configuration
*/
#define CONFIG_SERIAL2 1 /* use SERIAL2 */
-#define CONFIG_BAUDRATE 115200
-
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-
-/* PWM */
-#define CONFIG_PWM 1
-
-/* It should define before config_cmd_default.h */
-#define CONFIG_SYS_NO_FLASH 1
/* Command definition */
#include <config_cmd_default.h>
@@ -68,10 +45,8 @@
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_XIMG
-#define CONFIG_CMD_CACHE
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_ONENAND
-#define CONFIG_CMD_MMC
#define CONFIG_CMD_DFU
#define CONFIG_CMD_GPT
@@ -104,7 +79,6 @@
",12m(modem)"\
",60m(qboot)\0"
-#define CONFIG_BOOTDELAY 1
#define CONFIG_ZERO_BOOTDELAY_CHECK
/* partitions definitions */
@@ -239,20 +213,9 @@
#define CONFIG_SAMSUNG_ONENAND 1
#define CONFIG_SYS_ONENAND_BASE 0xB0000000
-#define CONFIG_DOS_PARTITION 1
-
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-
/* write support for filesystems */
-#define CONFIG_FAT_WRITE
#define CONFIG_EXT4_WRITE
-/* GPT */
-#define CONFIG_EFI_PARTITION
-#define CONFIG_PARTITION_UUIDS
-
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
#define CONFIG_SYS_CACHELINE_SIZE 64
@@ -281,4 +244,6 @@
#define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USB_GADGET_MASS_STORAGE
+#define CONFIG_DEFAULT_DEVICE_TREE s5pc1xx-goni
+
#endif /* __CONFIG_H */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 8/8] samsung: Move smdkc100 to use exynos-common config
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (6 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config Simon Glass
@ 2014-07-23 12:11 ` Simon Glass
2014-09-09 10:26 ` Przemyslaw Marczak
2014-07-24 8:34 ` [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Lukasz Majewski
8 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-07-23 12:11 UTC (permalink / raw)
To: u-boot
Change this board to use the exynos common config and add a device tree.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/s5pc1xx-smdkc100.dts | 21 +++++++++++++++
include/configs/smdkc100.h | 57 +++++++++------------------------------
3 files changed, 35 insertions(+), 44 deletions(-)
create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6a6e664..ed67844 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_S5PC100) += s5pc1xx-smdkc100.dtb
dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
exynos4210-smdkv310.dtb \
diff --git a/arch/arm/dts/s5pc1xx-smdkc100.dts b/arch/arm/dts/s5pc1xx-smdkc100.dts
new file mode 100644
index 0000000..409812d
--- /dev/null
+++ b/arch/arm/dts/s5pc1xx-smdkc100.dts
@@ -0,0 +1,21 @@
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+ model = "Samsung SMDKC100";
+ compatible = "samsung,smdkc100";
+
+ aliases {
+ serial0 = "/serial at 13800000";
+ console = "/serial at 13820000";
+ };
+
+};
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index c9a2e15..4fd288c 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -12,73 +12,51 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#include "exynos-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
+#undef CONFIG_BOARD_EARLY_INIT_F
+#undef CONFIG_GENERIC_MMC
+#undef CONFIG_CMD_MMC
+#undef CONFIG_MMC
+#undef CONFIG_S5P_SDHCI
+#undef CONFIG_EXYNOS_DWMMC
+
/*
* High Level Configuration Options
* (easy to change)
*/
-#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
-#define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC100 1 /* which is in a S5PC100 */
#define CONFIG_SMDKC100 1 /* working with SMDKC100 */
-#include <asm/arch/cpu.h> /* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-/* input clock of PLL: SMDKC100 has 12MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 12000000
-
/* DRAM Base */
#define CONFIG_SYS_SDRAM_BASE 0x30000000
/* Text Base */
#define CONFIG_SYS_TEXT_BASE 0x34800000
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/*
- * Size of malloc() pool
- * 1MB = 0x100000, 0x100000 = 1024 * 1024
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))
/*
* select serial console configuration
*/
#define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */
-/* PWM */
-#define CONFIG_PWM 1
-
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE 115200
/***********************************************************
* Command definition
***********************************************************/
-#include <config_cmd_default.h>
#undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_NAND
-#define CONFIG_CMD_CACHE
#define CONFIG_CMD_REGINFO
#define CONFIG_CMD_ONENAND
#define CONFIG_CMD_ELF
-#define CONFIG_CMD_FAT
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_BOOTDELAY 3
-
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
@@ -153,14 +131,7 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT "SMDKC100 # "
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5e00000)
@@ -176,8 +147,6 @@
/*-----------------------------------------------------------------------
* FLASH and environment organization
*/
-#define CONFIG_SYS_NO_FLASH 1
-
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */
#define CONFIG_IDENT_STRING " for SMDKC100"
@@ -203,8 +172,6 @@
#define CONFIG_SAMSUNG_ONENAND 1
#define CONFIG_SYS_ONENAND_BASE 0xE7100000
-#define CONFIG_DOS_PARTITION 1
-
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
/*
@@ -217,4 +184,6 @@
#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/
#endif /* CONFIG_CMD_NET */
+#define CONFIG_DEFAULT_DEVICE_TREE s5pc1xx-smdkc100
+
#endif /* __CONFIG_H */
--
2.0.0.526.g5318336
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
` (7 preceding siblings ...)
2014-07-23 12:11 ` [U-Boot] [PATCH 8/8] samsung: Move smdkc100 " Simon Glass
@ 2014-07-24 8:34 ` Lukasz Majewski
2014-07-25 14:43 ` Simon Glass
8 siblings, 1 reply; 22+ messages in thread
From: Lukasz Majewski @ 2014-07-24 8:34 UTC (permalink / raw)
To: u-boot
Hi Simon,
> This series tries to unify the Samsung board configs into a few header
> files for exynos5 and exynos5.
>
> The purpose is to make it easier to move to driver model. In that case
> I would like things like the GPIO drivers and serial drivers to work
> in a standard way, and not need to support device tree and platform
> data at the same time. That would be quite painful.
>
> Another reason is that the Chrome OS EC drivers are currently
> included in boards that don't have a Chrome OS EC. This concern was
> raised by the Samsung maintainer (Minkyu) a while back.
>
> There are still a few boards that don't use CONFIG_OF_CONTROL so I
> have updated these with the most rudimentary of device tree files.
>
> Unfortunately I don't have boards for most of these (for testing) and
> I am hoping that the maintainers can come to the rescue and fix up any
> patches that have problems. I am also worried that I have used a
> common exynos file for things like smdkv310, when in fact they have
> some other chip in common.
>
> So maintainers, please can you test this and re-issue the patch, or
> make comments on my attempts?
We will do our best to test our Exynos4 based boards.
>
>
> Simon Glass (8):
> exynos: Rename -dt config files to -common
> exynos: Move common exynos settings into a common file
> exynos: Move common smdk5420 things to common file
> exynos: config: Move cros_ec and tps65090 out of smdk boards
> config: Move arndale to use common exynos5250 file
> config: Move smdkv310 to use common exynos4 file
> samsung: Move s5p_goni to use exynos-common config
> samsung: Move smdkc100 to use exynos-common config
>
> arch/arm/dts/Makefile | 3 +
> arch/arm/dts/exynos4210-smdkv310.dts | 21 ++
> arch/arm/dts/s5pc1xx-goni.dts | 21 ++
> arch/arm/dts/s5pc1xx-smdkc100.dts | 21 ++
> arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++
> arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 +++++
> drivers/mmc/s5p_sdhci.c | 2 -
> include/configs/arndale.h | 212
> ++------------------- include/configs/{exynos4-dt.h =>
> exynos-common.h} | 104 +++-------
> include/configs/exynos4-common.h | 64 +++++++
> include/configs/{exynos5-dt.h => exynos5-common.h} | 110 ++---------
> include/configs/exynos5-dt-common.h | 35
> ++++ .../{exynos5250-dt.h => exynos5250-common.h} | 5
> +- .../configs/{exynos5420.h => exynos5420-common.h} | 11 +-
> include/configs/origen.h | 5 +-
> include/configs/peach-pit.h | 8 +-
> include/configs/s5p_goni.h | 55 +-----
> include/configs/s5pc210_universal.h | 5 +-
> include/configs/smdk5250.h | 6 +-
> include/configs/smdk5420.h | 7 +-
> include/configs/smdkc100.h | 57 ++----
> include/configs/smdkv310.h | 65 ++-----
> include/configs/snow.h | 8 +-
> include/configs/trats.h | 6 +-
> include/configs/trats2.h | 6 +- 25 files
> changed, 390 insertions(+), 558 deletions(-) create mode 100644
> arch/arm/dts/exynos4210-smdkv310.dts create mode 100644
> arch/arm/dts/s5pc1xx-goni.dts create mode 100644
> arch/arm/dts/s5pc1xx-smdkc100.dts create mode 100644
> arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644
> arch/arm/include/asm/arch-s5pc1xx/pinmux.h rename
> include/configs/{exynos4-dt.h => exynos-common.h} (54%) create mode
> 100644 include/configs/exynos4-common.h rename
> include/configs/{exynos5-dt.h => exynos5-common.h} (70%) create mode
> 100644 include/configs/exynos5-dt-common.h rename
> include/configs/{exynos5250-dt.h => exynos5250-common.h} (92%) rename
> include/configs/{exynos5420.h => exynos5420-common.h} (88%)
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-07-24 8:34 ` [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Lukasz Majewski
@ 2014-07-25 14:43 ` Simon Glass
2014-09-09 6:05 ` Simon Glass
0 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-07-25 14:43 UTC (permalink / raw)
To: u-boot
Hi Lucasz,
On 24 July 2014 09:34, Lukasz Majewski <l.majewski@samsung.com> wrote:
> Hi Simon,
>
>> This series tries to unify the Samsung board configs into a few header
>> files for exynos5 and exynos5.
>>
>> The purpose is to make it easier to move to driver model. In that case
>> I would like things like the GPIO drivers and serial drivers to work
>> in a standard way, and not need to support device tree and platform
>> data at the same time. That would be quite painful.
>>
>> Another reason is that the Chrome OS EC drivers are currently
>> included in boards that don't have a Chrome OS EC. This concern was
>> raised by the Samsung maintainer (Minkyu) a while back.
>>
>> There are still a few boards that don't use CONFIG_OF_CONTROL so I
>> have updated these with the most rudimentary of device tree files.
>>
>> Unfortunately I don't have boards for most of these (for testing) and
>> I am hoping that the maintainers can come to the rescue and fix up any
>> patches that have problems. I am also worried that I have used a
>> common exynos file for things like smdkv310, when in fact they have
>> some other chip in common.
>>
>> So maintainers, please can you test this and re-issue the patch, or
>> make comments on my attempts?
>
> We will do our best to test our Exynos4 based boards.
Thanks - please feel free to re-issue the patches and I will drop mine
(if you cc me).
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-07-25 14:43 ` Simon Glass
@ 2014-09-09 6:05 ` Simon Glass
2014-09-09 10:31 ` Przemyslaw Marczak
0 siblings, 1 reply; 22+ messages in thread
From: Simon Glass @ 2014-09-09 6:05 UTC (permalink / raw)
To: u-boot
Hi Minkyu,
On 25 July 2014 08:43, Simon Glass <sjg@chromium.org> wrote:
> Hi Lucasz,
>
> On 24 July 2014 09:34, Lukasz Majewski <l.majewski@samsung.com> wrote:
> > Hi Simon,
> >
> >> This series tries to unify the Samsung board configs into a few header
> >> files for exynos5 and exynos5.
> >>
> >> The purpose is to make it easier to move to driver model. In that case
> >> I would like things like the GPIO drivers and serial drivers to work
> >> in a standard way, and not need to support device tree and platform
> >> data at the same time. That would be quite painful.
> >>
> >> Another reason is that the Chrome OS EC drivers are currently
> >> included in boards that don't have a Chrome OS EC. This concern was
> >> raised by the Samsung maintainer (Minkyu) a while back.
> >>
> >> There are still a few boards that don't use CONFIG_OF_CONTROL so I
> >> have updated these with the most rudimentary of device tree files.
> >>
> >> Unfortunately I don't have boards for most of these (for testing) and
> >> I am hoping that the maintainers can come to the rescue and fix up any
> >> patches that have problems. I am also worried that I have used a
> >> common exynos file for things like smdkv310, when in fact they have
> >> some other chip in common.
> >>
> >> So maintainers, please can you test this and re-issue the patch, or
> >> make comments on my attempts?
> >
> > We will do our best to test our Exynos4 based boards.
>
> Thanks - please feel free to re-issue the patches and I will drop mine
> (if you cc me).
>
Can you please review this series? We are already at rc2.
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config
2014-07-23 12:11 ` [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config Simon Glass
@ 2014-09-09 10:26 ` Przemyslaw Marczak
2014-09-09 19:37 ` Simon Glass
0 siblings, 1 reply; 22+ messages in thread
From: Przemyslaw Marczak @ 2014-09-09 10:26 UTC (permalink / raw)
To: u-boot
Hello Simon,
On 07/23/2014 02:11 PM, Simon Glass wrote:
> Change this board to use the exynos common config and add a device tree.
>
> This also adds a pinmux header file - but it is just a copy of the exynos
> one so may be incorrect.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/s5pc1xx-goni.dts | 21 ++++++++++
> arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++++++++++++++++++++++++++
> arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 ++++++++++++++++++++++++
> drivers/mmc/s5p_sdhci.c | 2 -
> include/configs/s5p_goni.h | 55 +++++----------------------
> 6 files changed, 143 insertions(+), 47 deletions(-)
> create mode 100644 arch/arm/dts/s5pc1xx-goni.dts
> create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h
> create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 3b760ff..6a6e664 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1,3 +1,4 @@
> +dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
> dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
> exynos4210-smdkv310.dtb \
> exynos4210-universal_c210.dtb \
> diff --git a/arch/arm/dts/s5pc1xx-goni.dts b/arch/arm/dts/s5pc1xx-goni.dts
> new file mode 100644
> index 0000000..c390c8f
> --- /dev/null
> +++ b/arch/arm/dts/s5pc1xx-goni.dts
> @@ -0,0 +1,21 @@
> +/*
> + * Samsung's Exynos4210-based SMDKV310 board device tree source
> + *
> + * Copyright (c) 2014 Google, Inc
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +/dts-v1/;
This is a mistake. Exynos4 is different than s5pc1xx(which was later
called exynos3 and is also called s5pv210(kernel)).
So the s5pc1xx-goni.dts should include:
model = "Samsung Goni based on S5PC110";
compatible = "samsung,goni", "samsung,s5pc110";
And the base addresses are different than exynos4. Please look at:
arch/arm/include/asm/arch-s5pc1xx/cpu.h
This will require also a common file for s5pc1xx: s5pc1xx-common.dts.
Moreover, the S5PC100 and S5PC110 have lot of differences.
Simon, I think that this is a job for goni's maintainer, since you can't
test it on a hardware.
Robert, can you look at this?
> +/include/ "exynos4.dtsi"
> +
> +/ {
> + model = "Samsung SMDKV310 on Exynos4210";
> + compatible = "samsung,smdkv310", "samsung,exynos4210";
> +
> + aliases {
> + serial0 = "/serial at 13800000";
> + console = "/serial at 13820000";
> + };
> +
> +};
Best regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 8/8] samsung: Move smdkc100 to use exynos-common config
2014-07-23 12:11 ` [U-Boot] [PATCH 8/8] samsung: Move smdkc100 " Simon Glass
@ 2014-09-09 10:26 ` Przemyslaw Marczak
0 siblings, 0 replies; 22+ messages in thread
From: Przemyslaw Marczak @ 2014-09-09 10:26 UTC (permalink / raw)
To: u-boot
Hello Simon,
On 07/23/2014 02:11 PM, Simon Glass wrote:
> Change this board to use the exynos common config and add a device tree.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/s5pc1xx-smdkc100.dts | 21 +++++++++++++++
> include/configs/smdkc100.h | 57 +++++++++------------------------------
> 3 files changed, 35 insertions(+), 44 deletions(-)
> create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 6a6e664..ed67844 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1,3 +1,4 @@
> +dtb-$(CONFIG_S5PC100) += s5pc1xx-smdkc100.dtb
> dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
> dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
> exynos4210-smdkv310.dtb \
> diff --git a/arch/arm/dts/s5pc1xx-smdkc100.dts b/arch/arm/dts/s5pc1xx-smdkc100.dts
> new file mode 100644
> index 0000000..409812d
> --- /dev/null
> +++ b/arch/arm/dts/s5pc1xx-smdkc100.dts
> @@ -0,0 +1,21 @@
> +/*
> + * Samsung's Exynos4210-based SMDKV310 board device tree source
> + *
> + * Copyright (c) 2014 Google, Inc
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +/dts-v1/;
The same as in s5pc110:
> +/include/ "exynos4.dtsi"
> +
> +/ {
> + model = "Samsung SMDKC100";
> + compatible = "samsung,smdkc100";
> +
> + aliases {
Bad base addresses:
> + serial0 = "/serial at 13800000";
> + console = "/serial at 13820000";
> + };
> +
Best regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-09-09 6:05 ` Simon Glass
@ 2014-09-09 10:31 ` Przemyslaw Marczak
2014-09-12 8:39 ` Przemyslaw Marczak
0 siblings, 1 reply; 22+ messages in thread
From: Przemyslaw Marczak @ 2014-09-09 10:31 UTC (permalink / raw)
To: u-boot
Hi,
I will test this patch set on a trats2 board - today evening.
On 09/09/2014 08:05 AM, Simon Glass wrote:
> Hi Minkyu,
>
> On 25 July 2014 08:43, Simon Glass <sjg@chromium.org> wrote:
>
>> Hi Lucasz,
>>
>> On 24 July 2014 09:34, Lukasz Majewski <l.majewski@samsung.com> wrote:
>>> Hi Simon,
>>>
>>>> This series tries to unify the Samsung board configs into a few header
>>>> files for exynos5 and exynos5.
>>>>
>>>> The purpose is to make it easier to move to driver model. In that case
>>>> I would like things like the GPIO drivers and serial drivers to work
>>>> in a standard way, and not need to support device tree and platform
>>>> data at the same time. That would be quite painful.
>>>>
>>>> Another reason is that the Chrome OS EC drivers are currently
>>>> included in boards that don't have a Chrome OS EC. This concern was
>>>> raised by the Samsung maintainer (Minkyu) a while back.
>>>>
>>>> There are still a few boards that don't use CONFIG_OF_CONTROL so I
>>>> have updated these with the most rudimentary of device tree files.
>>>>
>>>> Unfortunately I don't have boards for most of these (for testing) and
>>>> I am hoping that the maintainers can come to the rescue and fix up any
>>>> patches that have problems. I am also worried that I have used a
>>>> common exynos file for things like smdkv310, when in fact they have
>>>> some other chip in common.
>>>>
>>>> So maintainers, please can you test this and re-issue the patch, or
>>>> make comments on my attempts?
>>>
>>> We will do our best to test our Exynos4 based boards.
>>
>> Thanks - please feel free to re-issue the patches and I will drop mine
>> (if you cc me).
>>
>
> Can you please review this series? We are already at rc2.
>
> Regards,
> Simon
>
>
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Best regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config
2014-09-09 10:26 ` Przemyslaw Marczak
@ 2014-09-09 19:37 ` Simon Glass
0 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-09-09 19:37 UTC (permalink / raw)
To: u-boot
Hi Przemyslaw,
On 9 September 2014 04:26, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
> Hello Simon,
>
>
> On 07/23/2014 02:11 PM, Simon Glass wrote:
>
>> Change this board to use the exynos common config and add a device tree.
>>
>> This also adds a pinmux header file - but it is just a copy of the exynos
>> one so may be incorrect.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> arch/arm/dts/Makefile | 1 +
>> arch/arm/dts/s5pc1xx-goni.dts | 21 ++++++++++
>> arch/arm/include/asm/arch-s5pc1xx/periph.h | 61
>> ++++++++++++++++++++++++++++++
>> arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50
>> ++++++++++++++++++++++++
>> drivers/mmc/s5p_sdhci.c | 2 -
>> include/configs/s5p_goni.h | 55
>> +++++----------------------
>> 6 files changed, 143 insertions(+), 47 deletions(-)
>> create mode 100644 arch/arm/dts/s5pc1xx-goni.dts
>> create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h
>> create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h
>>
>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> index 3b760ff..6a6e664 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -1,3 +1,4 @@
>> +dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
>> dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
>> exynos4210-smdkv310.dtb \
>> exynos4210-universal_c210.dtb \
>> diff --git a/arch/arm/dts/s5pc1xx-goni.dts b/arch/arm/dts/s5pc1xx-goni.
>> dts
>> new file mode 100644
>> index 0000000..c390c8f
>> --- /dev/null
>> +++ b/arch/arm/dts/s5pc1xx-goni.dts
>> @@ -0,0 +1,21 @@
>> +/*
>> + * Samsung's Exynos4210-based SMDKV310 board device tree source
>> + *
>> + * Copyright (c) 2014 Google, Inc
>> + *
>> + * SPDX-License-Identifier: GPL-2.0+
>> + */
>> +
>> +/dts-v1/;
>>
>
> This is a mistake. Exynos4 is different than s5pc1xx(which was later
> called exynos3 and is also called s5pv210(kernel)).
> So the s5pc1xx-goni.dts should include:
> model = "Samsung Goni based on S5PC110";
> compatible = "samsung,goni", "samsung,s5pc110";
>
Thanks for the review.
>
> And the base addresses are different than exynos4. Please look at:
> arch/arm/include/asm/arch-s5pc1xx/cpu.h
>
OK
>
> This will require also a common file for s5pc1xx: s5pc1xx-common.dts.
> Moreover, the S5PC100 and S5PC110 have lot of differences.
>
> Simon, I think that this is a job for goni's maintainer, since you can't
> test it on a hardware.
>
Yes that would be great. To be clear, my intent is to make all these boards
similar so that it is possible to change over the GPIO and serial drivers
to use driver model.
>
> Robert, can you look at this?
>
> +/include/ "exynos4.dtsi"
>> +
>> +/ {
>> + model = "Samsung SMDKV310 on Exynos4210";
>> + compatible = "samsung,smdkv310", "samsung,exynos4210";
>> +
>> + aliases {
>> + serial0 = "/serial at 13800000";
>> + console = "/serial at 13820000";
>> + };
>> +
>> +};
>>
>
>
> Best regards,
> --
> Przemyslaw Marczak
> Samsung R&D Institute Poland
> Samsung Electronics
> p.marczak at samsung.com
>
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file
2014-07-23 12:11 ` [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file Simon Glass
@ 2014-09-11 7:38 ` Minkyu Kang
2014-09-14 18:29 ` Simon Glass
0 siblings, 1 reply; 22+ messages in thread
From: Minkyu Kang @ 2014-09-11 7:38 UTC (permalink / raw)
To: u-boot
Dear Simon Glass,
On 23/07/14 21:11, Simon Glass wrote:
> Most of the arndale features are common with other exynos5250 boards. To
> permit easier addition of driver model support, use the common file.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> include/configs/arndale.h | 212 +++-------------------------------------------
> 1 file changed, 14 insertions(+), 198 deletions(-)
>
> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
> index 370db82..1f0bec9 100644
> --- a/include/configs/arndale.h
> +++ b/include/configs/arndale.h
> @@ -9,219 +9,55 @@
> #ifndef __CONFIG_ARNDALE_H
> #define __CONFIG_ARNDALE_H
>
> -/* High Level Configuration Options */
> -#define CONFIG_SAMSUNG /* in a SAMSUNG core */
> -#define CONFIG_S5P /* S5P Family */
> -#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
> -#define CONFIG_EXYNOS5250
> -
> -#include <asm/arch/cpu.h> /* get chip and board defs */
> -
> -#define CONFIG_SYS_GENERIC_BOARD
> -#define CONFIG_ARCH_CPU_INIT
> -#define CONFIG_DISPLAY_CPUINFO
> -#define CONFIG_DISPLAY_BOARDINFO
> -
> -#define CONFIG_OF_CONTROL
> -#define CONFIG_OF_SEPARATE
> -
> -/* Allow tracing to be enabled */
> -#define CONFIG_TRACE
> -#define CONFIG_CMD_TRACE
> -#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
> -#define CONFIG_TRACE_EARLY_SIZE (8 << 20)
> -#define CONFIG_TRACE_EARLY
> -#define CONFIG_TRACE_EARLY_ADDR 0x50000000
> -
> -/* Keep L2 Cache Disabled */
> -#define CONFIG_SYS_DCACHE_OFF
> -
> -#define CONFIG_SYS_SDRAM_BASE 0x40000000
> -#define CONFIG_SYS_TEXT_BASE 0x43E00000
> -
> -/* input clock of PLL: SMDK5250 has 24MHz input clock */
> -#define CONFIG_SYS_CLK_FREQ 24000000
> -
> -#define CONFIG_SETUP_MEMORY_TAGS
> -#define CONFIG_CMDLINE_TAG
> -#define CONFIG_INITRD_TAG
> -#define CONFIG_CMDLINE_EDITING
> -
> -/* Power Down Modes */
> -#define S5P_CHECK_SLEEP 0x00000BAD
> -#define S5P_CHECK_DIDLE 0xBAD00000
> -#define S5P_CHECK_LPA 0xABAD0000
> -
> -/* Offset for inform registers */
> -#define INFORM0_OFFSET 0x800
> -#define INFORM1_OFFSET 0x804
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
> -
> -/* select serial console configuration */
> -#define CONFIG_BAUDRATE 115200
> -#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
> -#define CONFIG_SILENT_CONSOLE
> -
> -/* Console configuration */
> -#define CONFIG_CONSOLE_MUX
> -#define CONFIG_SYS_CONSOLE_IS_IN_ENV
> -#define EXYNOS_DEVICE_SETTINGS \
> - "stdin=serial\0" \
> - "stdout=serial\0" \
> - "stderr=serial\0"
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - EXYNOS_DEVICE_SETTINGS
> +#include "exynos5250-common.h"
> +
> +#undef CONFIG_BOARD_COMMON
> +#undef CONFIG_ARCH_EARLY_INIT_R
>
> /* SD/MMC configuration */
> -#define CONFIG_GENERIC_MMC
> -#define CONFIG_MMC
> -#define CONFIG_SDHCI
> -#define CONFIG_S5P_SDHCI
> -#define CONFIG_DWMMC
> -#define CONFIG_EXYNOS_DWMMC
> #define CONFIG_SUPPORT_EMMC_BOOT
> -#define CONFIG_BOUNCE_BUFFER
> -
> -
> -#define CONFIG_BOARD_EARLY_INIT_F
> -#define CONFIG_SKIP_LOWLEVEL_INIT
> -
> -/* PWM */
> -#define CONFIG_PWM
>
> /* allow to overwrite serial and ethaddr */
> #define CONFIG_ENV_OVERWRITE
>
> -/* Command definition*/
> -#include <config_cmd_default.h>
> -
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_ELF
> -#define CONFIG_CMD_MMC
> #define CONFIG_CMD_EXT2
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_NET
> -#define CONFIG_CMD_HASH
> -
> -#define CONFIG_BOOTDELAY 3
> -#define CONFIG_ZERO_BOOTDELAY_CHECK
>
> /* USB */
> -#define CONFIG_CMD_USB
> +#undef CONFIG_USB_XHCI
> +#undef CONFIG_USB_XHCI_EXYNOS
> #define CONFIG_USB_EHCI
> #define CONFIG_USB_EHCI_EXYNOS
> -#define CONFIG_USB_STORAGE
>
> +#undef CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
> #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
> #define CONFIG_USB_HOST_ETHER
> #define CONFIG_USB_ETHER_ASIX
>
> /* MMC SPL */
> #define CONFIG_EXYNOS_SPL
> -#define CONFIG_SPL
> -#define COPY_BL2_FNPTR_ADDR 0x02020030
> -
> -#define CONFIG_SPL_LIBCOMMON_SUPPORT
> -
> -/* specific .lds file */
> -#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
> -#define CONFIG_SPL_TEXT_BASE 0x02023400
> -#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
> -
> -#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000"
>
> /* Miscellaneous configurable options */
> -#define CONFIG_SYS_LONGHELP /* undef to save memory */
> -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
> +#undef CONFIG_SYS_PROMPT
> #define CONFIG_SYS_PROMPT "ARNDALE # "
> -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
> -#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
> -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
> +#undef CONFIG_DEFAULT_CONSOLE
> #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
> -/* Boot Argument Buffer Size */
> -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
> -/* memtest works on */
> -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
> -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
> -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
> -
> -#define CONFIG_RD_LVL
>
> #define CONFIG_NR_DRAM_BANKS 8
> #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
> -#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
> -#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
> -#define PHYS_SDRAM_2_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_3 (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_3_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_4 (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_5 (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_5_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_6 (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_6_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_7 (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_7_SIZE SDRAM_BANK_SIZE
> -#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
> -#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE
> -
> -#define CONFIG_SYS_MONITOR_BASE 0x00000000
> -
> -/* FLASH and environment organization */
> -#define CONFIG_SYS_NO_FLASH
> -#undef CONFIG_CMD_IMLS
> -#define CONFIG_IDENT_STRING " for ARNDALE"
>
> -#define CONFIG_SYS_MMC_ENV_DEV 0
> +#undef CONFIG_IDENT_STRING
> +#define CONFIG_IDENT_STRING " for ARNDALE"
>
> +#undef CONFIG_ENV_IS_IN_SPI_FLASH
> #define CONFIG_ENV_IS_IN_MMC
> -#define CONFIG_SECURE_BL1_ONLY
> -
> -/* Secure FW size configuration */
> -#ifdef CONFIG_SECURE_BL1_ONLY
> -#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
> -#else
> -#define CONFIG_SEC_FW_SIZE 0
> -#endif
> -
> -/* Configuration of BL1, BL2, ENV Blocks on mmc */
> -#define CONFIG_RES_BLOCK_SIZE (512)
> -#define CONFIG_BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
> -#define CONFIG_BL2_SIZE (512UL << 10UL) /* 512 KB */
> -#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
> -
> -#define CONFIG_BL1_OFFSET (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
> -#define CONFIG_BL2_OFFSET (CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
> -#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
> -
> -/* U-boot copy size from boot Media to DRAM.*/
> -#define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512)
> -#define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512)
> -
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_EFI_PARTITION
> -#define CONFIG_CMD_PART
> -#define CONFIG_PARTITION_UUIDS
>
> +#undef CONFIG_ENV_OFFSET
> +#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
>
> #define CONFIG_IRAM_STACK 0x02050000
>
> #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
>
> -/* I2C */
> -#define CONFIG_SYS_I2C_INIT_BOARD
> -#define CONFIG_SYS_I2C
> -#define CONFIG_CMD_I2C
> -#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 /* 100 Kbps */
> -#define CONFIG_SYS_I2C_S3C24X0
> -#define CONFIG_MAX_I2C_NUM 8
> -#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
> -#define CONFIG_I2C_EDID
> -
> /* PMIC */
> #define CONFIG_PMIC
> #define CONFIG_POWER_I2C
> @@ -231,24 +67,4 @@
>
> #define CONFIG_PREBOOT
>
> -/* Ethernet Controllor Driver */
> -#ifdef CONFIG_CMD_NET
> -#define CONFIG_SMC911X
> -#define CONFIG_SMC911X_BASE 0x5000000
> -#define CONFIG_SMC911X_16_BIT
> -#define CONFIG_ENV_SROM_BANK 1
> -#endif /*CONFIG_CMD_NET*/
> -
> -/* Enable PXE Support */
> -#ifdef CONFIG_CMD_NET
> -#define CONFIG_CMD_PXE
> -#define CONFIG_MENU
> -#endif
> -
> -/* Enable devicetree support */
> -#define CONFIG_OF_LIBFDT
> -
> -/* Enable Time Command */
> -#define CONFIG_CMD_TIME
> -
> #endif /* __CONFIG_H */
>
Features those are you did undef at this file are not common features.
I think we should need to rearrange features.
Thanks,
Minkyu Kang.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to common file
2014-07-23 12:11 ` [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to " Simon Glass
@ 2014-09-11 7:38 ` Minkyu Kang
2014-09-14 18:31 ` Simon Glass
0 siblings, 1 reply; 22+ messages in thread
From: Minkyu Kang @ 2014-09-11 7:38 UTC (permalink / raw)
To: u-boot
Dear Simon Glass,
On 23/07/14 21:11, Simon Glass wrote:
> A few things are common but are not in the common file. Fix this and
> rename the file to fit with the other exynos*-common files.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++-----
> include/configs/peach-pit.h | 7 +------
> include/configs/smdk5420.h | 7 +------
> 3 files changed, 8 insertions(+), 17 deletions(-)
> rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)
>
> diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h
> similarity index 88%
> rename from include/configs/exynos5420.h
> rename to include/configs/exynos5420-common.h
> index d2a9556..685f9c1 100644
> --- a/include/configs/exynos5420.h
> +++ b/include/configs/exynos5420-common.h
> @@ -9,7 +9,9 @@
> #ifndef __CONFIG_EXYNOS5420_H
> #define __CONFIG_EXYNOS5420_H
>
> -#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */
> +#define CONFIG_EXYNOS5420
> +
> +#include <configs/exynos5-common.h>
>
> #define MACH_TYPE_SMDK5420 8002
> #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
> @@ -31,10 +33,6 @@
>
> #define CONFIG_MAX_I2C_NUM 11
>
> -/* Enable FIT support and comparison */
> -#define CONFIG_FIT
> -#define CONFIG_FIT_BEST_MATCH
> -
> #define CONFIG_BOARD_REV_GPIO_COUNT 2
>
> #define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000"
> @@ -49,4 +47,7 @@
> #define CONFIG_NR_DRAM_BANKS 7
> #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */
>
> +/* select serial console configuration */
> +#define CONFIG_SERIAL3 /* use SERIAL 3 */
I think it's a board specific feature.
> +
> #endif /* __CONFIG_EXYNOS5420_H */
> diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
> index 59192e1..407f10f 100644
> --- a/include/configs/peach-pit.h
> +++ b/include/configs/peach-pit.h
> @@ -9,16 +9,11 @@
> #ifndef __CONFIG_PEACH_PIT_H
> #define __CONFIG_PEACH_PIT_H
>
> -#include <configs/exynos5-common.h>
> -
> -#include <configs/exynos5420.h>
> +#include <configs/exynos5420-common.h>
>
> #undef CONFIG_DEFAULT_DEVICE_TREE
> #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit
>
> -/* select serial console configuration */
> -#define CONFIG_SERIAL3 /* use SERIAL 3 */
> -
> #define CONFIG_SYS_PROMPT "Peach # "
> #define CONFIG_IDENT_STRING " for Peach"
>
> diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
> index 43c9808..83abc13 100644
> --- a/include/configs/smdk5420.h
> +++ b/include/configs/smdk5420.h
> @@ -9,18 +9,13 @@
> #ifndef __CONFIG_SMDK5420_H
> #define __CONFIG_SMDK5420_H
>
> -#include <configs/exynos5-common.h>
> -
> -#include <configs/exynos5420.h>
> +#include <configs/exynos5420-common.h>
>
> #define CONFIG_SMDK5420 /* which is in a SMDK5420 */
>
> #undef CONFIG_DEFAULT_DEVICE_TREE
> #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420
>
> -/* select serial console configuration */
> -#define CONFIG_SERIAL3 /* use SERIAL 3 */
> -
> #define CONFIG_SYS_PROMPT "SMDK5420 # "
> #define CONFIG_IDENT_STRING " for SMDK5420"
>
>
Thanks,
Minkyu Kang.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-09-09 10:31 ` Przemyslaw Marczak
@ 2014-09-12 8:39 ` Przemyslaw Marczak
2014-09-12 14:48 ` Simon Glass
0 siblings, 1 reply; 22+ messages in thread
From: Przemyslaw Marczak @ 2014-09-12 8:39 UTC (permalink / raw)
To: u-boot
Hello Simon,
On 09/09/2014 12:31 PM, Przemyslaw Marczak wrote:
> Hi,
>
> I will test this patch set on a trats2 board - today evening.
>
> On 09/09/2014 08:05 AM, Simon Glass wrote:
>> Hi Minkyu,
>>
>> On 25 July 2014 08:43, Simon Glass <sjg@chromium.org> wrote:
>>
>>> Hi Lucasz,
>>>
>>> On 24 July 2014 09:34, Lukasz Majewski <l.majewski@samsung.com> wrote:
>>>> Hi Simon,
>>>>
>>>>> This series tries to unify the Samsung board configs into a few header
>>>>> files for exynos5 and exynos5.
>>>>>
>>>>> The purpose is to make it easier to move to driver model. In that case
>>>>> I would like things like the GPIO drivers and serial drivers to work
>>>>> in a standard way, and not need to support device tree and platform
>>>>> data at the same time. That would be quite painful.
>>>>>
>>>>> Another reason is that the Chrome OS EC drivers are currently
>>>>> included in boards that don't have a Chrome OS EC. This concern was
>>>>> raised by the Samsung maintainer (Minkyu) a while back.
>>>>>
>>>>> There are still a few boards that don't use CONFIG_OF_CONTROL so I
>>>>> have updated these with the most rudimentary of device tree files.
>>>>>
>>>>> Unfortunately I don't have boards for most of these (for testing) and
>>>>> I am hoping that the maintainers can come to the rescue and fix up any
>>>>> patches that have problems. I am also worried that I have used a
>>>>> common exynos file for things like smdkv310, when in fact they have
>>>>> some other chip in common.
>>>>>
>>>>> So maintainers, please can you test this and re-issue the patch, or
>>>>> make comments on my attempts?
>>>>
>>>> We will do our best to test our Exynos4 based boards.
>>>
>>> Thanks - please feel free to re-issue the patches and I will drop mine
>>> (if you cc me).
>>>
>>
>> Can you please review this series? We are already at rc2.
>>
>> Regards,
>> Simon
>>
>>
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
>>
>
> Best regards,
It works fine on trats2.
I'm currently working on PMIC framework at the top of your
u-boot-dm/working branch and it also works fine on Trats2.
Best regards
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted)
2014-09-12 8:39 ` Przemyslaw Marczak
@ 2014-09-12 14:48 ` Simon Glass
0 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-09-12 14:48 UTC (permalink / raw)
To: u-boot
Hi Przemyslaw,
On 12 September 2014 02:39, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
>
> Hello Simon,
>
>
> On 09/09/2014 12:31 PM, Przemyslaw Marczak wrote:
>>
>> Hi,
>>
>> I will test this patch set on a trats2 board - today evening.
>>
>> On 09/09/2014 08:05 AM, Simon Glass wrote:
>>>
>>> Hi Minkyu,
>>>
>>> On 25 July 2014 08:43, Simon Glass <sjg@chromium.org> wrote:
>>>
>>>> Hi Lucasz,
>>>>
>>>> On 24 July 2014 09:34, Lukasz Majewski <l.majewski@samsung.com> wrote:
>>>>>
>>>>> Hi Simon,
>>>>>
>>>>>> This series tries to unify the Samsung board configs into a few header
>>>>>> files for exynos5 and exynos5.
>>>>>>
>>>>>> The purpose is to make it easier to move to driver model. In that case
>>>>>> I would like things like the GPIO drivers and serial drivers to work
>>>>>> in a standard way, and not need to support device tree and platform
>>>>>> data at the same time. That would be quite painful.
>>>>>>
>>>>>> Another reason is that the Chrome OS EC drivers are currently
>>>>>> included in boards that don't have a Chrome OS EC. This concern was
>>>>>> raised by the Samsung maintainer (Minkyu) a while back.
>>>>>>
>>>>>> There are still a few boards that don't use CONFIG_OF_CONTROL so I
>>>>>> have updated these with the most rudimentary of device tree files.
>>>>>>
>>>>>> Unfortunately I don't have boards for most of these (for testing) and
>>>>>> I am hoping that the maintainers can come to the rescue and fix up any
>>>>>> patches that have problems. I am also worried that I have used a
>>>>>> common exynos file for things like smdkv310, when in fact they have
>>>>>> some other chip in common.
>>>>>>
>>>>>> So maintainers, please can you test this and re-issue the patch, or
>>>>>> make comments on my attempts?
>>>>>
>>>>>
>>>>> We will do our best to test our Exynos4 based boards.
>>>>
>>>>
>>>> Thanks - please feel free to re-issue the patches and I will drop mine
>>>> (if you cc me).
>>>>
>>>
>>> Can you please review this series? We are already at rc2.
>>>
>>> Regards,
>>> Simon
>>>
>>>
>>>
>>> _______________________________________________
>>> U-Boot mailing list
>>> U-Boot at lists.denx.de
>>> http://lists.denx.de/mailman/listinfo/u-boot
>>>
>>
>> Best regards,
>
>
> It works fine on trats2.
> I'm currently working on PMIC framework at the top of your u-boot-dm/working branch and it also works fine on Trats2.
OK good, thanks for testing. I'll go through the feedback and see if I
can give the patches another spin. It would be great if we can get
exynos DM support in mainline for the upcoming release.
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file
2014-09-11 7:38 ` Minkyu Kang
@ 2014-09-14 18:29 ` Simon Glass
0 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-09-14 18:29 UTC (permalink / raw)
To: u-boot
Hi Minkyu,
On 11 September 2014 01:38, Minkyu Kang <mk7.kang@samsung.com> wrote:
> Dear Simon Glass,
>
> On 23/07/14 21:11, Simon Glass wrote:
>> Most of the arndale features are common with other exynos5250 boards. To
>> permit easier addition of driver model support, use the common file.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> include/configs/arndale.h | 212 +++-------------------------------------------
>> 1 file changed, 14 insertions(+), 198 deletions(-)
>>
>> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
>> index 370db82..1f0bec9 100644
>> --- a/include/configs/arndale.h
>> +++ b/include/configs/arndale.h
>> @@ -9,219 +9,55 @@
>> #ifndef __CONFIG_ARNDALE_H
>> #define __CONFIG_ARNDALE_H
>>
>> -/* High Level Configuration Options */
>> -#define CONFIG_SAMSUNG /* in a SAMSUNG core */
>> -#define CONFIG_S5P /* S5P Family */
>> -#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
>> -#define CONFIG_EXYNOS5250
>> -
>> -#include <asm/arch/cpu.h> /* get chip and board defs */
>> -
>> -#define CONFIG_SYS_GENERIC_BOARD
>> -#define CONFIG_ARCH_CPU_INIT
>> -#define CONFIG_DISPLAY_CPUINFO
>> -#define CONFIG_DISPLAY_BOARDINFO
>> -
>> -#define CONFIG_OF_CONTROL
>> -#define CONFIG_OF_SEPARATE
>> -
>> -/* Allow tracing to be enabled */
>> -#define CONFIG_TRACE
>> -#define CONFIG_CMD_TRACE
>> -#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
>> -#define CONFIG_TRACE_EARLY_SIZE (8 << 20)
>> -#define CONFIG_TRACE_EARLY
>> -#define CONFIG_TRACE_EARLY_ADDR 0x50000000
>> -
>> -/* Keep L2 Cache Disabled */
>> -#define CONFIG_SYS_DCACHE_OFF
>> -
>> -#define CONFIG_SYS_SDRAM_BASE 0x40000000
>> -#define CONFIG_SYS_TEXT_BASE 0x43E00000
>> -
>> -/* input clock of PLL: SMDK5250 has 24MHz input clock */
>> -#define CONFIG_SYS_CLK_FREQ 24000000
>> -
>> -#define CONFIG_SETUP_MEMORY_TAGS
>> -#define CONFIG_CMDLINE_TAG
>> -#define CONFIG_INITRD_TAG
>> -#define CONFIG_CMDLINE_EDITING
>> -
>> -/* Power Down Modes */
>> -#define S5P_CHECK_SLEEP 0x00000BAD
>> -#define S5P_CHECK_DIDLE 0xBAD00000
>> -#define S5P_CHECK_LPA 0xABAD0000
>> -
>> -/* Offset for inform registers */
>> -#define INFORM0_OFFSET 0x800
>> -#define INFORM1_OFFSET 0x804
>> -
>> -/* Size of malloc() pool */
>> -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
>> -
>> -/* select serial console configuration */
>> -#define CONFIG_BAUDRATE 115200
>> -#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
>> -#define CONFIG_SILENT_CONSOLE
>> -
>> -/* Console configuration */
>> -#define CONFIG_CONSOLE_MUX
>> -#define CONFIG_SYS_CONSOLE_IS_IN_ENV
>> -#define EXYNOS_DEVICE_SETTINGS \
>> - "stdin=serial\0" \
>> - "stdout=serial\0" \
>> - "stderr=serial\0"
>> -
>> -#define CONFIG_EXTRA_ENV_SETTINGS \
>> - EXYNOS_DEVICE_SETTINGS
>> +#include "exynos5250-common.h"
>> +
>> +#undef CONFIG_BOARD_COMMON
>> +#undef CONFIG_ARCH_EARLY_INIT_R
>>
>> /* SD/MMC configuration */
>> -#define CONFIG_GENERIC_MMC
>> -#define CONFIG_MMC
>> -#define CONFIG_SDHCI
>> -#define CONFIG_S5P_SDHCI
>> -#define CONFIG_DWMMC
>> -#define CONFIG_EXYNOS_DWMMC
>> #define CONFIG_SUPPORT_EMMC_BOOT
>> -#define CONFIG_BOUNCE_BUFFER
>> -
>> -
>> -#define CONFIG_BOARD_EARLY_INIT_F
>> -#define CONFIG_SKIP_LOWLEVEL_INIT
>> -
>> -/* PWM */
>> -#define CONFIG_PWM
>>
>> /* allow to overwrite serial and ethaddr */
>> #define CONFIG_ENV_OVERWRITE
>>
>> -/* Command definition*/
>> -#include <config_cmd_default.h>
>> -
>> -#define CONFIG_CMD_PING
>> -#define CONFIG_CMD_ELF
>> -#define CONFIG_CMD_MMC
>> #define CONFIG_CMD_EXT2
>> -#define CONFIG_CMD_FAT
>> -#define CONFIG_CMD_NET
>> -#define CONFIG_CMD_HASH
>> -
>> -#define CONFIG_BOOTDELAY 3
>> -#define CONFIG_ZERO_BOOTDELAY_CHECK
>>
>> /* USB */
>> -#define CONFIG_CMD_USB
>> +#undef CONFIG_USB_XHCI
>> +#undef CONFIG_USB_XHCI_EXYNOS
>> #define CONFIG_USB_EHCI
>> #define CONFIG_USB_EHCI_EXYNOS
>> -#define CONFIG_USB_STORAGE
>>
>> +#undef CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
>> #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
>> #define CONFIG_USB_HOST_ETHER
>> #define CONFIG_USB_ETHER_ASIX
>>
>> /* MMC SPL */
>> #define CONFIG_EXYNOS_SPL
>> -#define CONFIG_SPL
>> -#define COPY_BL2_FNPTR_ADDR 0x02020030
>> -
>> -#define CONFIG_SPL_LIBCOMMON_SUPPORT
>> -
>> -/* specific .lds file */
>> -#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
>> -#define CONFIG_SPL_TEXT_BASE 0x02023400
>> -#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
>> -
>> -#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000"
>>
>> /* Miscellaneous configurable options */
>> -#define CONFIG_SYS_LONGHELP /* undef to save memory */
>> -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
>> +#undef CONFIG_SYS_PROMPT
>> #define CONFIG_SYS_PROMPT "ARNDALE # "
>> -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
>> -#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
>> -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
>> +#undef CONFIG_DEFAULT_CONSOLE
>> #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
>> -/* Boot Argument Buffer Size */
>> -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
>> -/* memtest works on */
>> -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
>> -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
>> -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
>> -
>> -#define CONFIG_RD_LVL
>>
>> #define CONFIG_NR_DRAM_BANKS 8
>> #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
>> -#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
>> -#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
>> -#define PHYS_SDRAM_2_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_3 (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_3_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_4 (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_5 (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_5_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_6 (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_6_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_7 (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_7_SIZE SDRAM_BANK_SIZE
>> -#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
>> -#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE
>> -
>> -#define CONFIG_SYS_MONITOR_BASE 0x00000000
>> -
>> -/* FLASH and environment organization */
>> -#define CONFIG_SYS_NO_FLASH
>> -#undef CONFIG_CMD_IMLS
>> -#define CONFIG_IDENT_STRING " for ARNDALE"
>>
>> -#define CONFIG_SYS_MMC_ENV_DEV 0
>> +#undef CONFIG_IDENT_STRING
>> +#define CONFIG_IDENT_STRING " for ARNDALE"
>>
>> +#undef CONFIG_ENV_IS_IN_SPI_FLASH
>> #define CONFIG_ENV_IS_IN_MMC
>> -#define CONFIG_SECURE_BL1_ONLY
>> -
>> -/* Secure FW size configuration */
>> -#ifdef CONFIG_SECURE_BL1_ONLY
>> -#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
>> -#else
>> -#define CONFIG_SEC_FW_SIZE 0
>> -#endif
>> -
>> -/* Configuration of BL1, BL2, ENV Blocks on mmc */
>> -#define CONFIG_RES_BLOCK_SIZE (512)
>> -#define CONFIG_BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
>> -#define CONFIG_BL2_SIZE (512UL << 10UL) /* 512 KB */
>> -#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
>> -
>> -#define CONFIG_BL1_OFFSET (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
>> -#define CONFIG_BL2_OFFSET (CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
>> -#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
>> -
>> -/* U-boot copy size from boot Media to DRAM.*/
>> -#define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512)
>> -#define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512)
>> -
>> -#define CONFIG_DOS_PARTITION
>> -#define CONFIG_EFI_PARTITION
>> -#define CONFIG_CMD_PART
>> -#define CONFIG_PARTITION_UUIDS
>>
>> +#undef CONFIG_ENV_OFFSET
>> +#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
>>
>> #define CONFIG_IRAM_STACK 0x02050000
>>
>> #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
>>
>> -/* I2C */
>> -#define CONFIG_SYS_I2C_INIT_BOARD
>> -#define CONFIG_SYS_I2C
>> -#define CONFIG_CMD_I2C
>> -#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 /* 100 Kbps */
>> -#define CONFIG_SYS_I2C_S3C24X0
>> -#define CONFIG_MAX_I2C_NUM 8
>> -#define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0
>> -#define CONFIG_I2C_EDID
>> -
>> /* PMIC */
>> #define CONFIG_PMIC
>> #define CONFIG_POWER_I2C
>> @@ -231,24 +67,4 @@
>>
>> #define CONFIG_PREBOOT
>>
>> -/* Ethernet Controllor Driver */
>> -#ifdef CONFIG_CMD_NET
>> -#define CONFIG_SMC911X
>> -#define CONFIG_SMC911X_BASE 0x5000000
>> -#define CONFIG_SMC911X_16_BIT
>> -#define CONFIG_ENV_SROM_BANK 1
>> -#endif /*CONFIG_CMD_NET*/
>> -
>> -/* Enable PXE Support */
>> -#ifdef CONFIG_CMD_NET
>> -#define CONFIG_CMD_PXE
>> -#define CONFIG_MENU
>> -#endif
>> -
>> -/* Enable devicetree support */
>> -#define CONFIG_OF_LIBFDT
>> -
>> -/* Enable Time Command */
>> -#define CONFIG_CMD_TIME
>> -
>> #endif /* __CONFIG_H */
>>
>
> Features those are you did undef at this file are not common features.
> I think we should need to rearrange features.
OK I'll take these out of the common file.
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
* [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to common file
2014-09-11 7:38 ` Minkyu Kang
@ 2014-09-14 18:31 ` Simon Glass
0 siblings, 0 replies; 22+ messages in thread
From: Simon Glass @ 2014-09-14 18:31 UTC (permalink / raw)
To: u-boot
Hi Minkyu,
On 11 September 2014 01:38, Minkyu Kang <mk7.kang@samsung.com> wrote:
> Dear Simon Glass,
>
> On 23/07/14 21:11, Simon Glass wrote:
>> A few things are common but are not in the common file. Fix this and
>> rename the file to fit with the other exynos*-common files.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++-----
>> include/configs/peach-pit.h | 7 +------
>> include/configs/smdk5420.h | 7 +------
>> 3 files changed, 8 insertions(+), 17 deletions(-)
>> rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)
>>
>> diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h
>> similarity index 88%
>> rename from include/configs/exynos5420.h
>> rename to include/configs/exynos5420-common.h
>> index d2a9556..685f9c1 100644
>> --- a/include/configs/exynos5420.h
>> +++ b/include/configs/exynos5420-common.h
>> @@ -9,7 +9,9 @@
>> #ifndef __CONFIG_EXYNOS5420_H
>> #define __CONFIG_EXYNOS5420_H
>>
>> -#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */
>> +#define CONFIG_EXYNOS5420
>> +
>> +#include <configs/exynos5-common.h>
>>
>> #define MACH_TYPE_SMDK5420 8002
>> #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420
>> @@ -31,10 +33,6 @@
>>
>> #define CONFIG_MAX_I2C_NUM 11
>>
>> -/* Enable FIT support and comparison */
>> -#define CONFIG_FIT
>> -#define CONFIG_FIT_BEST_MATCH
>> -
>> #define CONFIG_BOARD_REV_GPIO_COUNT 2
>>
>> #define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000"
>> @@ -49,4 +47,7 @@
>> #define CONFIG_NR_DRAM_BANKS 7
>> #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */
>>
>> +/* select serial console configuration */
>> +#define CONFIG_SERIAL3 /* use SERIAL 3 */
>
> I think it's a board specific feature.
OK I'll take it out of common.
[snip]
Regards,
Simon
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2014-09-14 18:31 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-23 12:11 [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 1/8] exynos: Rename -dt config files to -common Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 2/8] exynos: Move common exynos settings into a common file Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 3/8] exynos: Move common smdk5420 things to " Simon Glass
2014-09-11 7:38 ` Minkyu Kang
2014-09-14 18:31 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 4/8] exynos: config: Move cros_ec and tps65090 out of smdk boards Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 5/8] config: Move arndale to use common exynos5250 file Simon Glass
2014-09-11 7:38 ` Minkyu Kang
2014-09-14 18:29 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 6/8] config: Move smdkv310 to use common exynos4 file Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 7/8] samsung: Move s5p_goni to use exynos-common config Simon Glass
2014-09-09 10:26 ` Przemyslaw Marczak
2014-09-09 19:37 ` Simon Glass
2014-07-23 12:11 ` [U-Boot] [PATCH 8/8] samsung: Move smdkc100 " Simon Glass
2014-09-09 10:26 ` Przemyslaw Marczak
2014-07-24 8:34 ` [U-Boot] [PATCH 0/8] samsung: Use common config files with Samsung boards (help wanted) Lukasz Majewski
2014-07-25 14:43 ` Simon Glass
2014-09-09 6:05 ` Simon Glass
2014-09-09 10:31 ` Przemyslaw Marczak
2014-09-12 8:39 ` Przemyslaw Marczak
2014-09-12 14:48 ` Simon Glass
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.