[U-Boot] [PATCH v4 00/11] S3C24XX: Add support to MINI2416 board

[U-Boot] [PATCH v4 00/11] S3C24XX: Add support to MINI2416 board

[José Miguel Gonçalves]

Support for the MINI2416 board based on a Samsung's S3C2416 SoC with
64MB DDR2 SDRAM, 256MB NAND Flash, a LAN9220 Ethernet Controller and a
WM8731 Audio CODEC.

Changes for v2:
   - Coding style cleanup
   - Removed new serial and rtc drivers
   - Use of in-tree serial and rtc drivers

Changes for v3:
   - Rebased on new SPL framework:
     http://github.com/trini/u-boot WIP/spl-improvements
   - Removed patch "ARM: fix relocation on ARM926EJS"
   - Add patch to configure printf() inclusion on SPL
   - Changed new binary target name from u-boot-ubl.bin to u-boot-pad.bin
   - Removed magic numbers
   - Checkpatch clean except:
     - False positive:
	ERROR: spaces required around that ':' (ctx:VxV)
	#692: FILE: include/configs/mini2416.h:165:
	+#define CONFIG_ETHADDR			FE:11:22:33:44:55
     - Following preexistent coding style:
	WARNING: please, no spaces at the start of a line
	#1716: FILE: include/common.h:631:
	+    defined(CONFIG_S3C24XX) || \$

Changes for v4:
   - NAND Flash driver cleanup and optimization

Jos? Miguel Gon?alves (11):
  Add configuration option to select printf() inclusion on SPL
  S3C24XX: Add core support for Samsung's S3C24XX SoCs
  serial: Add support to 4 ports in serial_s3c24x0
  serial: Use a more precise baud rate generation for serial_s3c24x0
  serial: Remove unnecessary delay in serial_s3c24x0
  rtc: Improve rtc_get() on s3c24x0_rtc
  rtc: Fix rtc_reset() on s3c24x0_rtc
  rtc: Don't allow setting unsuported years on s3c24x0_rtc
  S3C24XX: Add NAND Flash driver
  Add u-boot-pad.bin target to the Makefile
  S3C24XX: Add support to MINI2416 board

 MAINTAINERS                                     |    4 +
 Makefile                                        |   11 +-
 README                                          |    3 +
 arch/arm/cpu/arm926ejs/s3c24xx/Makefile         |   56 +++
 arch/arm/cpu/arm926ejs/s3c24xx/cpu.c            |   57 +++
 arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c       |   57 +++
 arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c  |  114 +++++
 arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c  |  116 +++++
 arch/arm/cpu/arm926ejs/s3c24xx/timer.c          |  152 ++++++
 arch/arm/include/asm/arch-s3c24xx/s3c2412.h     |  130 +++++
 arch/arm/include/asm/arch-s3c24xx/s3c2416.h     |  183 +++++++
 arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h |   41 ++
 arch/arm/include/asm/arch-s3c24xx/s3c24xx.h     |  615 +++++++++++++++++++++++
 arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h |   30 ++
 arch/arm/include/asm/arch-s3c24xx/spl.h         |   29 ++
 board/boardcon/mini2416/Makefile                |   47 ++
 board/boardcon/mini2416/config.mk               |    4 +
 board/boardcon/mini2416/mini2416.c              |  104 ++++
 board/boardcon/mini2416/mini2416_spl.c          |  203 ++++++++
 board/boardcon/mini2416/u-boot-spl.lds          |   63 +++
 boards.cfg                                      |    1 +
 drivers/mtd/nand/Makefile                       |    1 +
 drivers/mtd/nand/s3c24xx_nand.c                 |  255 +++++++++
 drivers/rtc/s3c24x0_rtc.c                       |   30 +-
 drivers/serial/serial_s3c24x0.c                 |   52 +-
 include/common.h                                |   12 +
 include/configs/VCMA9.h                         |    2 +-
 include/configs/mini2416.h                      |  202 ++++++++
 include/configs/smdk2410.h                      |    2 +-
 29 files changed, 2549 insertions(+), 27 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/Makefile
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/cpu.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/timer.c
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c2412.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c2416.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24xx.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/spl.h
 create mode 100644 board/boardcon/mini2416/Makefile
 create mode 100644 board/boardcon/mini2416/config.mk
 create mode 100644 board/boardcon/mini2416/mini2416.c
 create mode 100644 board/boardcon/mini2416/mini2416_spl.c
 create mode 100644 board/boardcon/mini2416/u-boot-spl.lds
 create mode 100644 drivers/mtd/nand/s3c24xx_nand.c
 create mode 100644 include/configs/mini2416.h

-- 
1.7.9.5

[U-Boot] [PATCH v4 01/11] Add configuration option to select printf() inclusion on SPL

[José Miguel Gonçalves]

The printf() implementation needs 4~5KB of storage space which may not be
available when building an SPL for SoCs with scarce internal RAM
(8KB or less). This patch adds a new option, CONFIG_SPL_PRINTF_SUPPORT,
to deal with this.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v3:
   - New patch

Changes for v4:
   - None
---
 README           |    3 +++
 include/common.h |   11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/README b/README
index 016d8bc..988812c 100644
--- a/README
+++ b/README
@@ -2576,6 +2576,9 @@ FIT uImage format:
 		CONFIG_SPL_LIBCOMMON_SUPPORT
 		Support for common/libcommon.o in SPL binary
 
+		CONFIG_SPL_PRINTF_SUPPORT
+		Enable printf() support in common/libcommon.o
+
 		CONFIG_SPL_LIBDISK_SUPPORT
 		Support for disk/libdisk.o in SPL binary
 
diff --git a/include/common.h b/include/common.h
index 55025c0..c10d745 100644
--- a/include/common.h
+++ b/include/common.h
@@ -805,9 +805,20 @@ int	tstc(void);
 /* stdout */
 void	putc(const char c);
 void	puts(const char *s);
+/*
+ * The printf() implementation needs 4~5KB of storage space which may not be
+ * available when building an SPL for SoCs with scarce internal RAM
+ * (8KB or less). To force printf() inclusion on an SPL we must define
+ * CONFIG_SPL_LIBCOMMON_SUPPORT and CONFIG_SPL_PRINTF_SUPPORT.
+ */
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_PRINTF_SUPPORT)
 int	printf(const char *fmt, ...)
 		__attribute__ ((format (__printf__, 1, 2)));
 int	vprintf(const char *fmt, va_list args);
+#else
+#define printf(fmt...) do {} while (0)
+#define vprintf(fmt, args) do {} while (0)
+#endif
 
 /* stderr */
 #define eputc(c)		fputc(stderr, c)
-- 
1.7.9.5

[U-Boot] [PATCH v4 02/11] S3C24XX: Add core support for Samsung's S3C24XX SoCs

[José Miguel Gonçalves]

This patch adds the support for Samsung's S3C24XX SoCs that have an ARM926EJS core.
Currently it supports S3C2412, S3C2413, S3C2416 and S3C2450.
Tested on an S3C2416 platform.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - Added register bit macros to avoid magic numbers
   - Removed volatile attribute from register structs
   - Added s3c24x0_cpu.h to be able to use drivers from s3c24x0 family
   - Fixed EPLL computation in get_PLLCLK for S3C2416
   - Added display of UCLK in print_cpu_info
   - Use of clrsetbits_le32()

Changes for v3:
   - Add __noreturn attribute to reset_cpu()
   - Removed magic numbers
   - Add arch/arm/include/asm/arch-s3c24xx/spl.h for new SPL framework

Changes for v4:
   - None
---
 arch/arm/cpu/arm926ejs/s3c24xx/Makefile         |   56 +++
 arch/arm/cpu/arm926ejs/s3c24xx/cpu.c            |   57 +++
 arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c       |   57 +++
 arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c  |  114 +++++
 arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c  |  116 +++++
 arch/arm/cpu/arm926ejs/s3c24xx/timer.c          |  152 ++++++
 arch/arm/include/asm/arch-s3c24xx/s3c2412.h     |  130 +++++
 arch/arm/include/asm/arch-s3c24xx/s3c2416.h     |  183 +++++++
 arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h |   41 ++
 arch/arm/include/asm/arch-s3c24xx/s3c24xx.h     |  615 +++++++++++++++++++++++
 arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h |   30 ++
 arch/arm/include/asm/arch-s3c24xx/spl.h         |   29 ++
 include/common.h                                |    1 +
 13 files changed, 1581 insertions(+)
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/Makefile
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/cpu.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c
 create mode 100644 arch/arm/cpu/arm926ejs/s3c24xx/timer.c
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c2412.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c2416.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24xx.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h
 create mode 100644 arch/arm/include/asm/arch-s3c24xx/spl.h

diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/Makefile b/arch/arm/cpu/arm926ejs/s3c24xx/Makefile
new file mode 100644
index 0000000..d7f5e0d
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/Makefile
@@ -0,0 +1,56 @@
+#
+# (C) Copyright 2012 INOV - INESC Inovacao
+# Jose Goncalves <jose.goncalves@inov.pt>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(SOC).o
+
+ifndef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_DISPLAY_CPUINFO)	+= cpu_info.o
+endif
+
+ifeq ($(filter y,$(CONFIG_S3C2412) $(CONFIG_S3C2413)),y)
+COBJS-y	+= s3c2412_speed.o
+else
+COBJS-y	+= s3c2416_speed.o
+endif
+
+COBJS-y	+= cpu.o
+COBJS-y	+= timer.o
+
+SRCS	:= $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS-y))
+
+all:	$(obj).depend $(LIB)
+
+$(LIB):	$(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/cpu.c b/arch/arm/cpu/arm926ejs/s3c24xx/cpu.c
new file mode 100644
index 0000000..a6a90d8
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/cpu.c
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <linux/compiler.h>
+#include <asm/io.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+void enable_caches(void)
+{
+#ifndef CONFIG_SYS_ICACHE_OFF
+	icache_enable();
+#endif
+#ifndef CONFIG_SYS_DCACHE_OFF
+	dcache_enable();
+#endif
+}
+
+/*
+ * Reset the cpu by setting up the watchdog timer and let him time out.
+ */
+void __noreturn reset_cpu(ulong addr)
+{
+	struct s3c24xx_watchdog *const watchdog = s3c24xx_get_base_watchdog();
+
+	/* Disable watchdog */
+	writel(WTCON_DISABLE_VAL, &watchdog->wtcon);
+
+	/* Initialize watchdog timer count register with the minimum value */
+	writel(0x0001, &watchdog->wtcnt);
+
+	/* Enable watchdog timer; assert reset at timer timeout */
+	writel(WTCON_RSTEN | WTCON_ENABLE, &watchdog->wtcon);
+
+	while (1)
+		/* loop forever and wait for reset to happen */;
+}
diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c b/arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c
new file mode 100644
index 0000000..d2a8b95
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/cpu_info.c
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2010
+ * David Mueller <d.mueller@elsoft.ch>
+ *
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+typedef ulong(*getfreq) (void);
+
+static const getfreq freq_f[] = {
+	get_FCLK,
+	get_HCLK,
+	get_PCLK,
+	get_UCLK,
+};
+
+static const char freq_c[] = { 'F', 'H', 'P', 'U' };
+
+int print_cpuinfo(void)
+{
+	int i;
+	char buf[32];
+	ulong cpuid;
+	struct s3c24xx_gpio *const gpio = s3c24xx_get_base_gpio();
+
+	cpuid = readl(&gpio->gstatus[1]);
+	printf("CPU:  %8s (id %08lX) @ %s MHz\n", s3c24xx_get_cpu_name(),
+	       cpuid, strmhz(buf, get_ARMCLK()));
+	for (i = 0; i < ARRAY_SIZE(freq_f); i++)
+		printf("%cCLK: %8s MHz\n", freq_c[i],
+		       strmhz(buf, freq_f[i] ()));
+
+	return 0;
+}
diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c b/arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c
new file mode 100644
index 0000000..d584cf2
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/s3c2412_speed.c
@@ -0,0 +1,114 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * Based on U-Boot 1.3.4 from Samsung.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/s3c2412.h>
+
+#define MPLL 0
+#define UPLL 1
+
+/* ------------------------------------------------------------------------- */
+/*
+ * CONFIG_SYS_CLK_FREQ should be defined as the input frequency of the PLL.
+ *
+ * get_FCLK(), get_HCLK(), get_PCLK() and get_UCLK() return the clock of
+ * the specified bus in HZ.
+ */
+/* ------------------------------------------------------------------------- */
+
+static ulong get_PLLCLK(int pllreg)
+{
+	struct s3c2412_sysctl *const sysctl = s3c2412_get_base_sysctl();
+	u32 pllcon, f;
+	u16 mdiv, pdiv, sdiv;
+
+	if (pllreg == MPLL)
+		pllcon = readl(&sysctl->mpllcon);
+	else if (pllreg == UPLL)
+		pllcon = readl(&sysctl->upllcon);
+	else
+		hang();
+
+	mdiv = PLLCON_MDIV_GET(pllcon);
+	pdiv = PLLCON_PDIV_GET(pllcon);
+	sdiv = PLLCON_SDIV_GET(pllcon);
+
+	f = (mdiv + 8) * (CONFIG_SYS_CLK_FREQ / ((pdiv + 2) << sdiv));
+	if (pllreg == MPLL)
+		f <<= 1;
+
+	return f;
+}
+
+/* return FCLK frequency */
+ulong get_FCLK(void)
+{
+	return get_PLLCLK(MPLL);
+}
+
+/* return HCLK frequency */
+ulong get_HCLK(void)
+{
+	struct s3c2412_sysctl *const sysctl = s3c2412_get_base_sysctl();
+	u32 clkdivn;
+	u16 hclk_div, arm_div;
+
+	clkdivn = readl(&sysctl->clkdivn);
+	hclk_div = CLKDIVN_HCLKDIV_GET(clkdivn) + 1;
+	arm_div = CLKDIVN_ARMDIV_GET(clkdivn) + 1;
+
+	return get_FCLK() / (hclk_div * arm_div);
+}
+
+/* return PCLK frequency */
+ulong get_PCLK(void)
+{
+	struct s3c2412_sysctl *const sysctl = s3c2412_get_base_sysctl();
+	u32 clkdivn;
+
+	clkdivn = readl(&sysctl->clkdivn);
+
+	return (clkdivn & CLKDIVN_PCLKDIV) ? get_HCLK() / 2 : get_HCLK();
+}
+
+/* return UCLK frequency */
+ulong get_UCLK(void)
+{
+	return get_PLLCLK(UPLL);
+}
+
+/* return ARMCORE frequency */
+ulong get_ARMCLK(void)
+{
+	struct s3c2412_sysctl *const sysctl = s3c2412_get_base_sysctl();
+	u32 clkdivn;
+
+	clkdivn = readl(&sysctl->clkdivn);
+	if (clkdivn & CLKDIVN_DVS)
+		return get_FCLK();
+
+	return (clkdivn & CLKDIVN_ARMDIV) ? get_FCLK() / 2 : get_FCLK();
+}
diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c b/arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c
new file mode 100644
index 0000000..625e603
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/s3c2416_speed.c
@@ -0,0 +1,116 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * Based on U-Boot 1.3.4 from Samsung.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/s3c2416.h>
+
+#define MPLL 0
+#define EPLL 1
+
+/* ------------------------------------------------------------------------- */
+/*
+ * CONFIG_SYS_CLK_FREQ should be defined as the input frequency of the PLL.
+ *
+ * get_FCLK(), get_HCLK(), get_PCLK() and get_UCLK() return the clock of
+ * the specified bus in HZ.
+ */
+/* ------------------------------------------------------------------------- */
+
+static ulong get_PLLCLK(int pllreg)
+{
+	struct s3c2416_sysctl *const sysctl = s3c2416_get_base_sysctl();
+	u32 pllcon;
+	u16 mdiv, pdiv, sdiv;
+
+	if (pllreg == MPLL) {
+		pllcon = readl(&sysctl->mpllcon);
+		mdiv = MPLLCON_MDIV_GET(pllcon);
+		pdiv = MPLLCON_PDIV_GET(pllcon);
+	} else if (pllreg == EPLL) {
+		pllcon = readl(&sysctl->epllcon);
+		mdiv = EPLLCON_MDIV_GET(pllcon);
+		pdiv = EPLLCON_PDIV_GET(pllcon);
+	} else {
+		hang();
+	}
+
+	sdiv = PLLCON_SDIV_GET(pllcon);
+
+	return mdiv * (CONFIG_SYS_CLK_FREQ / (pdiv << sdiv));
+}
+
+/* return FCLK frequency */
+ulong get_FCLK(void)
+{
+	return get_PLLCLK(MPLL);
+}
+
+/* return HCLK frequency */
+ulong get_HCLK(void)
+{
+	struct s3c2416_sysctl *const sysctl = s3c2416_get_base_sysctl();
+	u32 clkdiv0;
+	u16 hclk_div, pre_div;
+
+	clkdiv0 = readl(&sysctl->clkdiv0);
+	hclk_div = (CLKDIV0_HCLKDIV_GET(clkdiv0)) + 1;
+	pre_div = (CLKDIV0_PREDIV_GET(clkdiv0)) + 1;
+
+	return get_FCLK() / (hclk_div * pre_div);
+}
+
+/* return PCLK frequency */
+ulong get_PCLK(void)
+{
+	struct s3c2416_sysctl *const sysctl = s3c2416_get_base_sysctl();
+	u32 clkdiv0;
+
+	clkdiv0 = readl(&sysctl->clkdiv0);
+
+	return (clkdiv0 & CLKDIV0_PCLKDIV) ? get_HCLK() / 2 : get_HCLK();
+}
+
+/* return UCLK frequency */
+ulong get_UCLK(void)
+{
+	return get_PLLCLK(EPLL);
+}
+
+/* return ARMCORE frequency */
+ulong get_ARMCLK(void)
+{
+	struct s3c2416_sysctl *const sysctl = s3c2416_get_base_sysctl();
+	u32 clkdiv0;
+	u16 arm_div;
+
+	clkdiv0 = readl(&sysctl->clkdiv0);
+	if (clkdiv0 & CLKDIV0_DVS)
+		return get_FCLK();
+
+	arm_div = CLKDIV0_ARMDIV_GET(clkdiv0) + 1;
+
+	return get_FCLK() / arm_div;
+}
diff --git a/arch/arm/cpu/arm926ejs/s3c24xx/timer.c b/arch/arm/cpu/arm926ejs/s3c24xx/timer.c
new file mode 100644
index 0000000..1a838f8
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/s3c24xx/timer.c
@@ -0,0 +1,152 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * Based on arch/arm/cpu/armv7/s5p-common/timer.c and U-Boot 1.3.4 from Samsung.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+#define PRESCALER 15
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static ulong get_current_tick(void)
+{
+	struct s3c24xx_timers *const timers = s3c24xx_get_base_timers();
+	ulong now = readl(&timers->tcnto4);
+
+	if (gd->lastinc >= now)
+		gd->tbl += gd->lastinc - now;
+	else
+		gd->tbl += gd->lastinc + gd->tbu - now;
+
+	gd->lastinc = now;
+
+	return gd->tbl;
+}
+
+int timer_init(void)
+{
+	struct s3c24xx_timers *const timers = s3c24xx_get_base_timers();
+
+	/* use PWM Timer 4 because it has no output */
+	if (gd->tbu == 0) {
+		/* set divider value for Timer 4 to 2 */
+		clrsetbits_le32(&timers->tcfg1, TCFG1_MUX4_MASK,
+				TCFG1_MUX4_DIV2);
+		/* set prescaler value for Timer 4 to PRESCALER */
+		clrsetbits_le32(&timers->tcfg0, TCFG0_PRESCALER1_MASK,
+				TCFG0_PRESCALER1(PRESCALER));
+		/*
+		 * Timer Freq(HZ) =
+		 *      PCLK / (prescaler_value + 1) / (divider_value)
+		 */
+		gd->timer_rate_hz = get_PCLK() / (PRESCALER + 1) / 2;
+		gd->tbu = gd->timer_rate_hz / CONFIG_SYS_HZ;
+	}
+	/* load value for selected timeout */
+	writel(gd->tbu, &timers->tcntb4);
+	/* auto reload, manual update of timer 4 */
+	clrsetbits_le32(&timers->tcon, TCON_T4START,
+			TCON_T4RELOAD | TCON_T4MANUALUPD);
+	/* auto reload, start timer 4 */
+	clrsetbits_le32(&timers->tcon, TCON_T4MANUALUPD,
+			TCON_T4RELOAD | TCON_T4START);
+	gd->lastinc = 0;
+	gd->tbl = 0;
+
+	return 0;
+}
+
+ulong get_timer(ulong base)
+{
+	return get_timer_masked() - base;
+}
+
+void __udelay(unsigned long usec)
+{
+	ulong tmo, tmp;
+
+	if (usec >= 1000) {
+		/*
+		 * if "big" number, spread normalization
+		 * to seconds
+		 * 1. start to normalize for usec to ticks per sec
+		 * 2. find number of "ticks" to wait to achieve target
+		 * 3. finish normalize.
+		 */
+		tmo = usec / 1000;
+		tmo *= gd->timer_rate_hz;
+		tmo /= 1000;
+	} else {
+		/* else small number, don't kill it prior to HZ multiply */
+		tmo = usec * gd->timer_rate_hz;
+		tmo /= (1000 * 1000);
+	}
+
+	/* get current timestamp */
+	tmp = get_current_tick();
+
+	/* if advancing the timestamp would roll-up the timer, reset it */
+	if ((tmo + tmp + 1) < tmp)
+		reset_timer_masked();
+	else
+		tmo += tmp;
+
+	/* loop till event */
+	while (get_current_tick() < tmo)
+		/* NOP */;
+}
+
+void reset_timer_masked(void)
+{
+	struct s3c24xx_timers *const timers = s3c24xx_get_base_timers();
+
+	/* reset time */
+	gd->lastinc = readl(&timers->tcnto4);
+	gd->tbl = 0;
+}
+
+ulong get_timer_masked(void)
+{
+	return get_current_tick() / gd->tbu;
+}
+
+/*
+ * This function is derived from PowerPC code (read timebase as long long).
+ * On ARM it just returns the timer value.
+ */
+unsigned long long get_ticks(void)
+{
+	return get_timer_masked();
+}
+
+/*
+ * This function is derived from PowerPC code (timebase clock frequency).
+ * On ARM it returns the number of timer ticks per second.
+ */
+ulong get_tbclk(void)
+{
+	return CONFIG_SYS_HZ;
+}
diff --git a/arch/arm/include/asm/arch-s3c24xx/s3c2412.h b/arch/arm/include/asm/arch-s3c24xx/s3c2412.h
new file mode 100644
index 0000000..8945308
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/s3c2412.h
@@ -0,0 +1,130 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/************************************************
+ * NAME	    : s3c2412.h
+ *
+ * Based on S3C2412 User's manual Rev 1.06a
+ ************************************************/
+
+#ifndef __S3C2412_H__
+#define __S3C2412_H__
+
+/* Base addresses for S3C2412 specific modules */
+#define S3C2412_INTERRUPT_BASE		0x4A000000
+#define S3C2412_SYSCTL_BASE		0x4C000000
+#define S3C2412_LCD_BASE		0x4D000000
+#define S3C2412_USB_DEVICE_BASE		0x52000000
+#define S3C2412_ADC_BASE		0x58000000
+#define S3C2412_SPI_BASE		0x59000000
+#define S3C2412_SDIO_BASE		0x5A000000
+
+#define S3C24XX_UART_CHANNELS	3
+#define S3C24XX_DMA_CHANNELS	4
+#define S3C24XX_SMC_BANKS	8
+
+#ifdef CONFIG_S3C2412
+#define S3C24XX_CPU_NAME	"S3C2412"
+#else
+#define S3C24XX_CPU_NAME	"S3C2413"
+#endif
+
+enum s3c24xx_uarts {
+	S3C24XX_UART0,
+	S3C24XX_UART1,
+	S3C24XX_UART2
+};
+
+enum s3c24xx_dmas {
+	S3C24XX_DMA0,
+	S3C24XX_DMA1,
+	S3C24XX_DMA2,
+	S3C24XX_DMA3
+};
+
+enum s3c24xx_smcs {
+	S3C24XX_SMC0,
+	S3C24XX_SMC1,
+	S3C24XX_SMC2,
+	S3C24XX_SMC3,
+	S3C24XX_SMC4,
+	S3C24XX_SMC5,
+	S3C24XX_SMC6,
+	S3C24XX_SMC7
+};
+
+/* Interrupt Controller */
+struct s3c2412_interrupt {
+	u32 srcpnd;
+	u32 intmod;
+	u32 intmsk;
+	u32 priority;
+	u32 intpnd;
+	u32 intoffset;
+	u32 subsrcpnd;
+	u32 intsubmsk;
+};
+
+/* System Controller */
+struct s3c2412_sysctl {
+	u32 locktime;
+	u32 mpllcon;
+	u32 upllcon;
+	u32 clkcon;
+	u32 _res1;
+	u32 clkdivn;
+	u32 oscset;
+	u32 clksrc;
+	u32 _res2;
+	u32 pwrcfg;
+	u32 _res3[2];
+	u32 swrstcon;
+	u32 rstcon;
+	u32 _res4[13];
+	u32 inform[4];
+};
+
+#define PLLCON_MDIV_GET(x)	(((x)>>12) & 0xFF)
+#define PLLCON_PDIV_GET(x)	(((x)>>4) & 0x3F)
+#define PLLCON_SDIV_GET(x)	(((x)>>0) & 0x3)
+
+#define CLKDIVN_DVS		(1<<4)
+#define CLKDIVN_ARMDIV_GET(x)	(((x)>>3) & 0x1)
+#define CLKDIVN_ARMDIV		(1<<3)
+#define CLKDIVN_PCLKDIV		(1<<2)
+#define CLKDIVN_HCLKDIV_GET(x)	(((x)>>0) & 0x3)
+
+static inline struct s3c2412_interrupt *s3c2412_get_base_interrupt(void)
+{
+	return (struct s3c2412_interrupt *)S3C2412_INTERRUPT_BASE;
+}
+
+static inline struct s3c2412_sysctl *s3c2412_get_base_sysctl(void)
+{
+	return (struct s3c2412_sysctl *)S3C2412_SYSCTL_BASE;
+}
+
+/* Include common stuff */
+#include <asm/arch/s3c24xx.h>
+
+#endif /*__S3C2412_H__*/
diff --git a/arch/arm/include/asm/arch-s3c24xx/s3c2416.h b/arch/arm/include/asm/arch-s3c24xx/s3c2416.h
new file mode 100644
index 0000000..748e7b8
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/s3c2416.h
@@ -0,0 +1,183 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/************************************************
+ * NAME	    : s3c2416.h
+ *
+ * Based on S3C2416 User's manual Rev 1.40
+ ************************************************/
+
+#ifndef __S3C2416_H__
+#define __S3C2416_H__
+
+/* Base addresses for S3C2416 specific modules */
+#define S3C2416_USB_DEVICE_BASE		0x49800000
+#define S3C2416_INTERRUPT_BASE		0x4A000000
+#define S3C2416_HSMMC_BASE		0x4A800000
+#define S3C2416_SYSCTL_BASE		0x4C000000
+#define S3C2416_LCD_BASE		0x4C800000
+#define S3C2416_HSSPI_BASE		0x52000000
+#define S3C2416_ADC_BASE		0x58000000
+
+#define S3C24XX_UART_CHANNELS	4
+#define S3C24XX_DMA_CHANNELS	6
+#define S3C24XX_SMC_BANKS	6
+
+#ifdef CONFIG_S3C2416
+#define S3C24XX_CPU_NAME	"S3C2416"
+#else
+#define S3C24XX_CPU_NAME	"S3C2450"
+#endif
+
+enum s3c24xx_uarts {
+	S3C24XX_UART0,
+	S3C24XX_UART1,
+	S3C24XX_UART2,
+	S3C24XX_UART3
+};
+
+enum s3c24xx_dmas {
+	S3C24XX_DMA0,
+	S3C24XX_DMA1,
+	S3C24XX_DMA2,
+	S3C24XX_DMA3,
+	S3C24XX_DMA4,
+	S3C24XX_DMA5
+};
+
+enum s3c24xx_smcs {
+	S3C24XX_SMC0,
+	S3C24XX_SMC1,
+	S3C24XX_SMC2,
+	S3C24XX_SMC3,
+	S3C24XX_SMC4,
+	S3C24XX_SMC5
+};
+
+/* Interrupt Controller */
+struct s3c2416_interrupt {
+	u32 srcpnd1;
+	u32 intmod1;
+	u32 intmsk1;
+	u32 _res1;
+	u32 intpnd1;
+	u32 intoffset1;
+	u32 subsrcpnd;
+	u32 intsubmsk;
+	u32 _res2[4];
+	u32 priority_mode1;
+	u32 priority_update1;
+	u32 _res3[2];
+	u32 srcpnd2;
+	u32 intmod2;
+	u32 intmsk2;
+	u32 _res4;
+	u32 intpnd2;
+	u32 intoffset2;
+	u32 _res5[6];
+	u32 priority_mode2;
+	u32 priority_update2;
+};
+
+/* System Controller */
+struct s3c2416_sysctl {
+	u32 lockcon0;
+	u32 lockcon1;
+	u32 oscset;
+	u32 _res1;
+	u32 mpllcon;
+	u32 _res2;
+	u32 epllcon;
+	u32 epllcon_k;
+	u32 clksrc;
+	u32 clkdiv0;
+	u32 clkdiv1;
+	u32 clkdiv2;
+	u32 hclkcon;
+	u32 pclkcon;
+	u32 sclkcon;
+	u32 _res3;
+	u32 pwrmode;
+	u32 swrst;
+	u32 _res4[2];
+	u32 busprio;
+	u32 _res5[3];
+	u32 pwrcfg;
+	u32 rstcon;
+	u32 rststat;
+	u32 wkupstat;
+	u32 inform[4];
+	u32 uphyctrl;
+	u32 uphypwr;
+	u32 urstcon;
+	u32 uclkcon;
+};
+
+#define MPLLCON_MDIV_MASK	(0x3FF<<14)
+#define MPLLCON_MDIV(x)		((x)<<14)
+#define MPLLCON_MDIV_GET(x)	(((x)>>14) & 0x3FF)
+#define MPLLCON_PDIV_MASK	(0x3F<<5)
+#define MPLLCON_PDIV(x)		((x)<<5)
+#define MPLLCON_PDIV_GET(x)	(((x)>>5) & 0x3F)
+
+#define EPLLCON_MDIV_MASK	(0xFF<<16)
+#define EPLLCON_MDIV(x)		((x)<<16)
+#define EPLLCON_MDIV_GET(x)	(((x)>>16) & 0xFF)
+#define EPLLCON_PDIV_MASK	(0x3F<<8)
+#define EPLLCON_PDIV(x)		((x)<<8)
+#define EPLLCON_PDIV_GET(x)	(((x)>>8) & 0x3F)
+
+#define PLLCON_SDIV_MASK	(0x7<<0)
+#define PLLCON_SDIV(x)		((x)<<0)
+#define PLLCON_SDIV_GET(x)	(((x)>>0) & 0x7)
+
+#define CLKSRC_MSYSCLK_MPLL	(1<<4)
+#define CLKSRC_ESYSCLK_EPLL	(1<<6)
+
+#define CLKDIV0_HCLKDIV_MASK	(0x3<<0)
+#define CLKDIV0_HCLKDIV(x)	((x)<<0)
+#define CLKDIV0_HCLKDIV_GET(x)	(((x)>>0) & 0x3)
+#define CLKDIV0_PCLKDIV		(1<<2)
+#define CLKDIV0_HALFHCLK	(1<<3)
+#define CLKDIV0_PREDIV_MASK	(3<<4)
+#define CLKDIV0_PREDIV(x)	((x)<<4)
+#define CLKDIV0_PREDIV_GET(x)	(((x)>>4) & 0x3)
+#define CLKDIV0_ARMDIV_MASK	(7<<9)
+#define CLKDIV0_ARMDIV(x)	((x)<<9)
+#define CLKDIV0_ARMDIV_GET(x)	(((x)>>9) & 0x7)
+#define CLKDIV0_DVS		(1<<13)
+
+static inline struct s3c2416_interrupt *s3c2416_get_base_interrupt(void)
+{
+	return (struct s3c2416_interrupt *)S3C2416_INTERRUPT_BASE;
+}
+
+static inline struct s3c2416_sysctl *s3c2416_get_base_sysctl(void)
+{
+	return (struct s3c2416_sysctl *)S3C2416_SYSCTL_BASE;
+}
+
+/* Include common stuff */
+#include <asm/arch/s3c24xx.h>
+
+#endif /*__S3C2416_H__*/
diff --git a/arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h b/arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h
new file mode 100644
index 0000000..e54a46b
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/s3c24x0_cpu.h
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* To be able to use s3c24x0 drivers */
+
+#ifndef __S3C24X0_CPU_H__
+#define __S3C24X0_CPU_H__
+
+#include <asm/arch/s3c24xx_cpu.h>
+
+#define s3c24x0_rtc s3c24xx_rtc
+#define s3c24x0_get_base_rtc s3c24xx_get_base_rtc
+
+#define S3C24X0_UART0 S3C24XX_UART0
+#define S3C24X0_UART1 S3C24XX_UART1
+#define S3C24X0_UART2 S3C24XX_UART2
+#define S3C24X0_UART3 S3C24XX_UART3
+#define s3c24x0_uart s3c24xx_uart
+#define s3c24x0_get_base_uart s3c24xx_get_base_uart
+
+#endif
diff --git a/arch/arm/include/asm/arch-s3c24xx/s3c24xx.h b/arch/arm/include/asm/arch-s3c24xx/s3c24xx.h
new file mode 100644
index 0000000..78c6941
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/s3c24xx.h
@@ -0,0 +1,615 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/******************************************************
+ * NAME	    : s3c24xx.h
+ *
+ * Common stuff for SAMSUNG S3C24XX SoC (ARM926EJ core)
+ ******************************************************/
+
+#ifndef __S3C24XX_H__
+#define __S3C24XX_H__
+
+/* Base addresses for S3C24XX common modules */
+#define S3C24XX_DRAMCTL_BASE		0x48000000
+#define S3C24XX_USB_HOST_BASE		0x49000000
+#define S3C24XX_DMA_BASE		0x4B000000
+#define S3C24XX_NAND_BASE		0x4E000000
+#define S3C24XX_SMC_BASE		0x4F000000
+#define S3C24XX_UART_BASE		0x50000000
+#define S3C24XX_TIMER_BASE		0x51000000
+#define S3C24XX_WATCHDOG_BASE		0x53000000
+#define S3C24XX_I2C_BASE		0x54000000
+#define S3C24XX_I2S_BASE		0x55000000
+#define S3C24XX_GPIO_BASE		0x56000000
+#define S3C24XX_RTC_BASE		0x57000000
+#define S3C24XX_ADC_BASE		0x58000000
+
+/* Mobile DRAM Controller */
+struct s3c24xx_dramctl {
+	u32 bankcfg;
+	u32 bankcon1;
+	u32 bankcon2;
+	u32 bankcon3;
+	u32 refresh;
+	u32 timeout;
+};
+
+#define BANKCFG_VAL_DDR2		0x00049253
+
+#define BANKCON1_VAL_DDR2		0x44000040
+#define BANKCON1_INIT_NORMAL		0x0
+#define BANKCON1_INIT_PALL		0x1
+#define BANKCON1_INIT_MRS		0x2
+#define BANKCON1_INIT_EMRS		0x3
+
+#define BANKCON2_VAL_DDR2		0x005D0035
+
+#define BANKCON3_VAL_EMRS1		0x44000000
+#define BANKCON3_EMRS1_CAS3		(3<<4)
+#define BANKCON3_EMRS1_OCD7		(7<<23)
+#define BANKCON3_VAL_EMRS2		0x80000000
+#define BANKCON3_VAL_EMRS3		0xC0000000
+#define BANKCON3_VAL_MRS		0x44000030
+#define BANKCON3_MRS_DLL_RESET		(1<<8)
+
+/* USB Host Controller */
+struct s3c24xx_usb_host {
+	u32 HcRevision;
+	u32 HcControl;
+	u32 HcCommonStatus;
+	u32 HcInterruptStatus;
+	u32 HcInterruptEnable;
+	u32 HcInterruptDisable;
+	u32 HcHCCA;
+	u32 HcPeriodCuttendED;
+	u32 HcControlHeadED;
+	u32 HcControlCurrentED;
+	u32 HcBulkHeadED;
+	u32 HcBuldCurrentED;
+	u32 HcDoneHead;
+	u32 HcRmInterval;
+	u32 HcFmRemaining;
+	u32 HcFmNumber;
+	u32 HcPeriodicStart;
+	u32 HcLSThreshold;
+	u32 HcRhDescriptorA;
+	u32 HcRhDescriptorB;
+	u32 HcRhStatus;
+	u32 HcRhPortStatus1;
+	u32 HcRhPortStatus2;
+};
+
+/* DMA Controller */
+struct s3c24xx_dma {
+	u32 disrc;
+	u32 disrcc;
+	u32 didst;
+	u32 didstc;
+	u32 dcon;
+	u32 dstat;
+	u32 dcsrc;
+	u32 dcdst;
+	u32 dmasktrig;
+	u32 dmareqsel0;
+};
+
+/* NAND Flash Controller */
+struct s3c24xx_nand {
+	u32 nfconf;
+	u32 nfcont;
+	u32 nfcmmd;
+	u32 nfaddr;
+	u32 nfdata;
+	u32 nfmeccd[2];
+	u32 nfseccd;
+	u32 nfsblk;
+	u32 nfeblk;
+	u32 nfstat;
+	u32 nfeccerr[2];
+	u32 nfmecc[2];
+	u32 nfsecc;
+	u32 nfmlcbitpt;
+#if !(defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413))
+	u32 nf8eccerr[3];
+	u32 nfm8ecc[4];
+	u32 nfmlc8bitpt[2];
+#endif
+};
+
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+#define NFCONF_ECCTYPE_MASK	(1<<24)
+#define NFCONF_ECCTYPE_1BIT	(0<<24)
+#define NFCONF_ECCTYPE_4BIT	(1<<24)
+#else
+#define NFCONF_ECCTYPE_MASK	(3<<23)
+#define NFCONF_ECCTYPE_1BIT	(0<<23)
+#define NFCONF_ECCTYPE_8BIT	(1<<23)
+#define NFCONF_ECCTYPE_4BIT	(2<<23)
+#endif
+#define NFCONF_TACLS_MASK	(7<<12)
+#define NFCONF_TWRPH0_MASK	(7<<8)
+#define NFCONF_TWRPH1_MASK	(7<<4)
+#define NFCONF_TACLS(x)		((x)<<12)
+#define NFCONF_TWRPH0(x)	((x)<<8)
+#define NFCONF_TWRPH1(x)	((x)<<4)
+
+#define NFCONT_ENABLE		(1<<0)
+#define NFCONT_NCE0		(1<<1)
+#define NFCONT_NCE1		(1<<2)
+#define NFCONT_INITSECC		(1<<4)
+#define NFCONT_INITMECC		(1<<5)
+#define NFCONT_SECCLOCK		(1<<6)
+#define NFCONT_MECCLOCK		(1<<7)
+#define NFCONT_WP		(1<<16)
+#define NFCONT_ECC_ENC		(1<<18)
+
+#define NFSTAT_RNB		(1<<0)
+
+/* SMC */
+struct s3c24xx_smc {
+	u32 smbidcy;
+	u32 smbwstrd;
+	u32 smbwstwr;
+	u32 smbwstoen;
+	u32 smbwstwen;
+	u32 smbc;
+	u32 smbs;
+	u32 smbwstbrd;
+};
+
+#define SMBC_RBLE		(1<<0)
+#define SMBC_WAIT_POL		(1<<1)
+#define SMBC_WAIT_EN		(1<<2)
+#define SMBC_MW_MASK		(0x3<<4)
+#define SMBC_MW_16BIT		(1<<4)
+#define SMBC_MW_8BIT		(0<<4)
+#define SMBC_DRNCS		(1<<7)
+#define SMBC_RSMAVD_RD		(1<<12)
+#define SMBC_DRNOWE		(1<<15)
+#define SMBC_RSMAVD_WR		(1<<20)
+
+/* UART */
+struct s3c24xx_uart {
+	u32 ulcon;
+	u32 ucon;
+	u32 ufcon;
+	u32 umcon;
+	u32 utrstat;
+	u32 uerstat;
+	u32 ufstat;
+	u32 umstat;
+#ifdef __BIG_ENDIAN
+	u8 _res1[3];
+	u8 utxh;
+	u8 _res2[3];
+	u8 urxh;
+#else				/* Little Endian */
+	u8 utxh;
+	u8 _res1[3];
+	u8 urxh;
+	u8 _res2[3];
+#endif
+	u32 ubrdiv;
+	u32 udivslot;
+};
+
+#define ULCON_8N1		0x03
+
+#define UCON_POLL		0x005
+
+#define UMCON_NOAFC		0
+
+#define UFCON_FIFOMODE		(1<<0)
+#define UFCON_RESETRX		(1<<1)
+#define UFCON_RESETTX		(1<<2)
+
+#define UTRSTAT_RXDR		(1<<0)
+#define UTRSTAT_TXFE		(1<<1)
+#define UTRSTAT_TXE		(1<<2)
+
+/* PWM Timer */
+struct s3c24xx_timer {
+	u32 tcntb;
+	u32 tcmpb;
+	u32 tcnto;
+};
+
+struct s3c24xx_timers {
+	u32 tcfg0;
+	u32 tcfg1;
+	u32 tcon;
+	struct s3c24xx_timer ch[4];
+	u32 tcntb4;
+	u32 tcnto4;
+};
+
+#define TCFG0_PRESCALER1_MASK	(0xFF<<8)
+#define TCFG0_PRESCALER1(x)	((x)<<8)
+
+#define TCFG1_MUX4_DIV2		(0<<16)
+#define TCFG1_MUX4_DIV4		(1<<16)
+#define TCFG1_MUX4_DIV8		(2<<16)
+#define TCFG1_MUX4_DIV16	(3<<16)
+#define TCFG1_MUX4_TCLK1	(4<<16)
+#define TCFG1_MUX4_MASK		(0xF<<16)
+
+#define TCON_T4START		(1<<20)
+#define TCON_T4MANUALUPD	(1<<21)
+#define TCON_T4RELOAD		(1<<22)
+
+/* Watchdog Timer */
+struct s3c24xx_watchdog {
+	u32 wtcon;
+	u32 wtdat;
+	u32 wtcnt;
+};
+
+#define WTCON_DISABLE_VAL	0
+#define WTCON_RSTEN		(1<<0)
+#define WTCON_INTEN		(1<<2)
+#define WTCON_ENABLE		(1<<5)
+
+/* IIC-Bus Interface */
+struct s3c24xx_i2c {
+	u32 iiccon;
+	u32 iicstat;
+	u32 iicadd;
+	u32 iicds;
+	u32 iiclc;
+};
+
+/* IIS-Bus Interface */
+struct s3c24xx_i2s {
+	u32 iiscon;
+	u32 iismod;
+	u32 iisfic;
+	u32 iispsr;
+	u32 iistxd;
+	u32 iisrxd;
+};
+
+/* I/O Ports */
+struct s3c24xx_gpio {
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+	u32 gpacon;
+	u32 gpadat;
+	u32 _res1[2];
+	u32 gpbcon;
+	u32 gpbdat;
+	u32 gpbdn;
+	u32 gpbslpcon;
+	u32 gpccon;
+	u32 gpcdat;
+	u32 gpcdn;
+	u32 gpcslpcon;
+	u32 gpdcon;
+	u32 gpddat;
+	u32 gpddn;
+	u32 gpdslpcon;
+	u32 gpecon;
+	u32 gpedat;
+	u32 gpedn;
+	u32 gpeslpcon;
+	u32 gpfcon;
+	u32 gpfdat;
+	u32 gpfdn;
+	u32 _res2;
+	u32 gpgcon;
+	u32 gpgdat;
+	u32 gpgdn;
+	u32 gpgslpcon;
+	u32 gphcon;
+	u32 gphdat;
+	u32 gphdn;
+	u32 gphslpcon;
+	u32 gpjcon;
+	u32 gpjdat;
+	u32 gpjdn;
+	u32 gpjslpcon;
+
+	u32 misccr;
+	u32 dclkcon;
+	u32 extint[3];
+	u32 eintflt[4];
+	u32 eintmask;
+	u32 eintpend;
+	u32 gstatus[6];
+	u32 mstcon;
+	u32 mslcon;
+	u32 dsc[2];
+#else
+	u32 gpacon;
+	u32 gpadat;
+	u32 _res1[2];
+	u32 gpbcon;
+	u32 gpbdat;
+	u32 gpbudp;
+	u32 gpbsel;
+	u32 gpccon;
+	u32 gpcdat;
+	u32 gpcudp;
+	u32 _res2;
+	u32 gpdcon;
+	u32 gpddat;
+	u32 gpdudp;
+	u32 _res3;
+	u32 gpecon;
+	u32 gpedat;
+	u32 gpeudp;
+	u32 gpesel;
+	u32 gpfcon;
+	u32 gpfdat;
+	u32 gpfudp;
+	u32 _res4;
+	u32 gpgcon;
+	u32 gpgdat;
+	u32 gpgudp;
+	u32 _res5;
+	u32 gphcon;
+	u32 gphdat;
+	u32 gphudp;
+	u32 _res6;
+
+	u32 misccr;
+	u32 dclkcon;
+	u32 extint[3];
+	u32 _res7[2];
+	u32 eintflt2;
+	u32 eintflt3;
+	u32 eintmask;
+	u32 eintpend;
+	u32 gstatus[2];
+	u32 _res8[3];
+	u32 dsc[4];
+
+	u32 gpjcon;
+	u32 gpjdat;
+	u32 gpjudp;
+	u32 gpjsel;
+	u32 gpkcon;
+	u32 gpkdat;
+	u32 gpkudp;
+	u32 _res9;
+	u32 gplcon;
+	u32 gpldat;
+	u32 gpludp;
+	u32 gplsel;
+	u32 gpmcon;
+	u32 gpmdat;
+	u32 gpmudp;
+	u32 _res10;
+
+	u32 dsc3;
+	u32 pddmcon;
+	u32 pdsmcon;
+#endif
+};
+
+#define GPACON_NRCS1		(1<<12)
+#define GPACON_CLE		(1<<17)
+#define GPACON_ALE		(1<<18)
+#define GPACON_NFWE		(1<<19)
+#define GPACON_NFRE		(1<<20)
+#define GPACON_NRSTOUT		(1<<21)
+#define GPACON_NFCE		(1<<22)
+
+#define GPCCON_MASK(x)		(0x3 << ((x) * 2))
+#define GPCCON_OUTPUT(x)	(0x1 << ((x) * 2))
+#define GPCDAT(x)		(1 << (x))
+
+#define GPHCON_MASK(x)		(0x3 << ((x) * 2))
+#define GPHCON_TXD(x)		(0x2 << ((x) * 4))
+#define GPHCON_RXD(x)		(0x2 << (((x) * 4) + 2))
+
+/* RTC */
+struct s3c24xx_rtc {
+#ifdef __BIG_ENDIAN
+	u8 _res1[67];
+	u8 rtccon;
+	u8 _res2[3];
+	u8 ticnt0;
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+	u8 _res3[4];
+#else
+	u8 _res3[3];
+	u8 ticnt2;
+#endif
+	u8 _res4[3];
+	u8 ticnt1;
+	u8 _res5[3];
+	u8 rtcalm;
+	u8 _res6[3];
+	u8 almsec;
+	u8 _res7[3];
+	u8 almmin;
+	u8 _res8[3];
+	u8 almhour;
+	u8 _res9[3];
+	u8 almdate;
+	u8 _res10[3];
+	u8 almmon;
+	u8 _res11[3];
+	u8 almyear;
+	u8 _res12[7];
+	u8 bcdsec;
+	u8 _res13[3];
+	u8 bcdmin;
+	u8 _res14[3];
+	u8 bcdhour;
+	u8 _res15[3];
+	u8 bcddate;
+	u8 _res16[3];
+	u8 bcdday;
+	u8 _res17[3];
+	u8 bcdmon;
+	u8 _res18[3];
+	u8 bcdyear;
+#if !(defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413))
+	u8 _res19[3];
+	u8 tickcnt;
+#endif
+#else				/*  little endian */
+	u8 _res0[64];
+	u8 rtccon;
+	u8 _res1[3];
+	u8 ticnt0;
+	u8 _res2[3];
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+	u8 _res3[4];
+#else
+	u8 ticnt2;
+	u8 _res3[3];
+#endif
+	u8 ticnt1;
+	u8 _res4[3];
+	u8 rtcalm;
+	u8 _res5[3];
+	u8 almsec;
+	u8 _res6[3];
+	u8 almmin;
+	u8 _res7[3];
+	u8 almhour;
+	u8 _res8[3];
+	u8 almdate;
+	u8 _res9[3];
+	u8 almmon;
+	u8 _res10[3];
+	u8 almyear;
+	u8 _res11[7];
+	u8 bcdsec;
+	u8 _res12[3];
+	u8 bcdmin;
+	u8 _res13[3];
+	u8 bcdhour;
+	u8 _res14[3];
+	u8 bcddate;
+	u8 _res15[3];
+	u8 bcdday;
+	u8 _res16[3];
+	u8 bcdmon;
+	u8 _res17[3];
+	u8 bcdyear;
+	u8 _res18[3];
+#if !(defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413))
+	u8 tickcnt;
+	u8 _res19[3];
+#endif
+#endif
+};
+
+#define RTCCON_RTCEN	(1<<0)
+#define RTCCON_CNTSEL	(1<<2)
+#define RTCCON_CLKRST	(1<<3)
+#define RTCCON_TICSEL	(1<<4)
+
+/* ADC & Touch Screen Interface */
+struct s3c24xx_adc {
+	u32 adccon;
+	u32 adctsc;
+	u32 adcdly;
+	u32 adcdat0;
+	u32 adcdat1;
+#if !(defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413))
+	u32 adcupdn;
+	u32 adcmux;
+#endif
+};
+
+static inline struct s3c24xx_dramctl *s3c24xx_get_base_dramctl(void)
+{
+	return (struct s3c24xx_dramctl *)S3C24XX_DRAMCTL_BASE;
+}
+
+static inline struct s3c24xx_usb_host *s3c24xx_get_base_usb_host(void)
+{
+	return (struct s3c24xx_usb_host *)S3C24XX_USB_HOST_BASE;
+}
+
+static inline struct s3c24xx_dma *s3c24xx_get_base_dma(enum s3c24xx_dmas n)
+{
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+	return (struct s3c24xx_dma *)(S3C24XX_DMA_BASE + (n * 0x40));
+#else
+	return (struct s3c24xx_dma *)(S3C24XX_DMA_BASE + (n * 0x100));
+#endif
+}
+
+static inline struct s3c24xx_nand *s3c24xx_get_base_nand(void)
+{
+	return (struct s3c24xx_nand *)S3C24XX_NAND_BASE;
+}
+
+static inline struct s3c24xx_smc *s3c24xx_get_base_smc(enum s3c24xx_smcs n)
+{
+	return (struct s3c24xx_smc *)(S3C24XX_SMC_BASE + (n * 0x20));
+}
+
+static inline struct s3c24xx_uart *s3c24xx_get_base_uart(enum s3c24xx_uarts n)
+{
+	return (struct s3c24xx_uart *)(S3C24XX_UART_BASE + (n * 0x4000));
+}
+
+static inline struct s3c24xx_timers *s3c24xx_get_base_timers(void)
+{
+	return (struct s3c24xx_timers *)S3C24XX_TIMER_BASE;
+}
+
+static inline struct s3c24xx_watchdog *s3c24xx_get_base_watchdog(void)
+{
+	return (struct s3c24xx_watchdog *)S3C24XX_WATCHDOG_BASE;
+}
+
+static inline struct s3c24xx_i2c *s3c24xx_get_base_i2c(void)
+{
+	return (struct s3c24xx_i2c *)S3C24XX_I2C_BASE;
+}
+
+static inline struct s3c24xx_i2s *s3c24xx_get_base_i2s(void)
+{
+	return (struct s3c24xx_i2s *)S3C24XX_I2S_BASE;
+}
+
+static inline struct s3c24xx_gpio *s3c24xx_get_base_gpio(void)
+{
+	return (struct s3c24xx_gpio *)S3C24XX_GPIO_BASE;
+}
+
+static inline struct s3c24xx_rtc *s3c24xx_get_base_rtc(void)
+{
+	return (struct s3c24xx_rtc *)S3C24XX_RTC_BASE;
+}
+
+static inline struct s3c24xx_adc *s3c24xx_get_base_adc(void)
+{
+	return (struct s3c24xx_adc *)S3C24XX_ADC_BASE;
+}
+
+static inline char *s3c24xx_get_cpu_name(void)
+{
+	return S3C24XX_CPU_NAME;
+}
+
+extern ulong get_ARMCLK(void);
+
+#endif /*__S3C24XX_H__*/
diff --git a/arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h b/arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h
new file mode 100644
index 0000000..59ccfd4
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/s3c24xx_cpu.h
@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#if defined(CONFIG_S3C2412) || defined(CONFIG_S3C2413)
+#include <asm/arch/s3c2412.h>
+#elif defined(CONFIG_S3C2416) || defined(CONFIG_S3C2450)
+#include <asm/arch/s3c2416.h>
+#else
+#error Please define the S3C24XX SoC type
+#endif
diff --git a/arch/arm/include/asm/arch-s3c24xx/spl.h b/arch/arm/include/asm/arch-s3c24xx/spl.h
new file mode 100644
index 0000000..2741fe7
--- /dev/null
+++ b/arch/arm/include/asm/arch-s3c24xx/spl.h
@@ -0,0 +1,29 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#ifndef	_ASM_ARCH_SPL_H_
+#define	_ASM_SPL_H_
+
+#define BOOT_DEVICE_NAND	1
+#define BOOT_DEVICE_MMC1	2
+
+#endif
diff --git a/include/common.h b/include/common.h
index c10d745..b63e814 100644
--- a/include/common.h
+++ b/include/common.h
@@ -628,6 +628,7 @@ ulong	get_OPB_freq (void);
 ulong	get_PCI_freq (void);
 #endif
 #if defined(CONFIG_S3C24X0) || \
+    defined(CONFIG_S3C24XX) || \
     defined(CONFIG_LH7A40X) || \
     defined(CONFIG_S3C6400) || \
     defined(CONFIG_EP93XX)
-- 
1.7.9.5

[U-Boot] [PATCH v4 03/11] serial: Add support to 4 ports in serial_s3c24x0

[José Miguel Gonçalves]

S3C2416 and S3C2450 have 4 UARTs insted of 3 found on older chips.
This patch adds support to the additional UART port and changes the
mapping between CONFIG_SERIAL? and S3C24X0_UART? in order they have
a direct correspondence.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - None

Changes for v4:
   - None
---
 drivers/serial/serial_s3c24x0.c |   25 ++++++++++++++++++-------
 include/configs/VCMA9.h         |    2 +-
 include/configs/smdk2410.h      |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 12bcdd3..280cd2d 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -2,6 +2,9 @@
  * (C) Copyright 2002
  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -24,17 +27,20 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SERIAL1
+#if defined(CONFIG_SERIAL0)
 #define UART_NR	S3C24X0_UART0
 
-#elif defined(CONFIG_SERIAL2)
+#elif defined(CONFIG_SERIAL1)
 #define UART_NR	S3C24X0_UART1
 
-#elif defined(CONFIG_SERIAL3)
+#elif defined(CONFIG_SERIAL2)
 #define UART_NR	S3C24X0_UART2
 
+#elif defined(CONFIG_SERIAL3)
+#define UART_NR	S3C24X0_UART3
+
 #else
-#error "Bad: you didn't configure serial ..."
+#error "You didn't configure serial."
 #endif
 
 #include <asm/io.h>
@@ -310,15 +316,20 @@ INIT_S3C_SERIAL_STRUCTURE(1, "s3ser1");
 DECLARE_S3C_SERIAL_FUNCTIONS(2);
 struct serial_device s3c24xx_serial2_device =
 INIT_S3C_SERIAL_STRUCTURE(2, "s3ser2");
+DECLARE_S3C_SERIAL_FUNCTIONS(3);
+struct serial_device s3c24xx_serial3_device =
+INIT_S3C_SERIAL_STRUCTURE(3, "s3ser3");
 
 __weak struct serial_device *default_serial_console(void)
 {
-#if defined(CONFIG_SERIAL1)
+#if defined(CONFIG_SERIAL0)
 	return &s3c24xx_serial0_device;
-#elif defined(CONFIG_SERIAL2)
+#elif defined(CONFIG_SERIAL1)
 	return &s3c24xx_serial1_device;
-#elif defined(CONFIG_SERIAL3)
+#elif defined(CONFIG_SERIAL2)
 	return &s3c24xx_serial2_device;
+#elif defined(CONFIG_SERIAL3)
+	return &s3c24xx_serial3_device;
 #else
 #error "CONFIG_SERIAL? missing."
 #endif
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 6ad4a6b..82db58f 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -122,7 +122,7 @@
  * select serial console configuration
  */
 #define CONFIG_S3C24X0_SERIAL
-#define CONFIG_SERIAL1		1	/* we use SERIAL 1 on VCMA9 */
+#define CONFIG_SERIAL0		1	/* we use SERIAL 0 on VCMA9 */
 
 /* USB support (currently only works with D-cache off) */
 #define CONFIG_USB_OHCI
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 8792c85..ea05f16 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -62,7 +62,7 @@
  * select serial console configuration
  */
 #define CONFIG_S3C24X0_SERIAL
-#define CONFIG_SERIAL1		1	/* we use SERIAL 1 on SMDK2410 */
+#define CONFIG_SERIAL0		1	/* we use SERIAL 0 on SMDK2410 */
 
 /************************************************************
  * USB support (currently only works with D-cache off)
-- 
1.7.9.5

[U-Boot] [PATCH v4 04/11] serial: Use a more precise baud rate generation for serial_s3c24x0

[José Miguel Gonçalves]

The values stored in the baud rate divisor register (UBRDIVn) and dividing
slot register (UDIVSLOTn), are used to determine the serial baudrate.
Previously only UBRDIVn was set. This patch initializes also UDIVSLOTn
which allows to obtain a more precise baudrate.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - Verbose patch description

Changes for v4:
   - None
---
 drivers/serial/serial_s3c24x0.c |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index 280cd2d..c9bc121 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -92,16 +92,32 @@ DECLARE_GLOBAL_DATA_PTR;
 static int hwflow;
 #endif
 
+/*
+ * The values stored in the baud rate divisor register (UBRDIVn) and dividing
+ * slot register (UDIVSLOTn), are used to determine the serial Tx/Rx clock rate
+ * (baud rate) as follows:
+ *     DIV_VAL = UBRDIVn + (num of 1?s in UDIVSLOTn) / 16
+ * Using UDIVSLOT, which is the factor of floating point divisor, you can make
+ * more accurate baud rate. Section 2.1.10 of the S3C2416 User's Manual suggests
+ * using the constants on the following table.
+ */
+static const int udivslot[] = {
+	0x0000, 0x0080, 0x0808, 0x0888, 0x2222, 0x4924, 0x4A52, 0x54AA,
+	0x5555, 0xD555, 0xD5D5, 0xDDD5, 0xDDDD, 0xDFDD, 0xDFDF, 0xFFDF,
+};
+
 void _serial_setbrg(const int dev_index)
 {
 	struct s3c24x0_uart *uart = s3c24x0_get_base_uart(dev_index);
-	unsigned int reg = 0;
+	u32 pclk;
+	u32 baudrate;
 	int i;
 
-	/* value is calculated so : (int)(PCLK/16./baudrate) -1 */
-	reg = get_PCLK() / (16 * gd->baudrate) - 1;
+	pclk = get_PCLK();
+	baudrate = gd->baudrate;
 
-	writel(reg, &uart->ubrdiv);
+	writel((pclk / baudrate / 16) - 1, &uart->ubrdiv);
+	writel(udivslot[(pclk / baudrate) % 16], &uart->udivslot);
 	for (i = 0; i < 100; i++)
 		/* Delay */ ;
 }
-- 
1.7.9.5

[U-Boot] [PATCH v4 05/11] serial: Remove unnecessary delay in serial_s3c24x0

[José Miguel Gonçalves]

The loop used to make a delay after baudrate setting is not necessary.
Moreover it is removed by the GCC optimizer (at least with GCC 4.6).

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - None

Changes for v4:
   - None
---
 drivers/serial/serial_s3c24x0.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index c9bc121..ec5d1cb 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -111,15 +111,12 @@ void _serial_setbrg(const int dev_index)
 	struct s3c24x0_uart *uart = s3c24x0_get_base_uart(dev_index);
 	u32 pclk;
 	u32 baudrate;
-	int i;
 
 	pclk = get_PCLK();
 	baudrate = gd->baudrate;
 
 	writel((pclk / baudrate / 16) - 1, &uart->ubrdiv);
 	writel(udivslot[(pclk / baudrate) % 16], &uart->udivslot);
-	for (i = 0; i < 100; i++)
-		/* Delay */ ;
 }
 
 #if defined(CONFIG_SERIAL_MULTI)
-- 
1.7.9.5

[U-Boot] [PATCH v4 06/11] rtc: Improve rtc_get() on s3c24x0_rtc

[José Miguel Gonçalves]

A better approach to avoid reading the RTC during updates, as sugested in
the S3C2416 User's Manual.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - Removed unneeded parenthesis

Changes for v4:
   - None
---
 drivers/rtc/s3c24x0_rtc.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index c16ff2e..b31dc53 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -65,20 +65,26 @@ int rtc_get(struct rtc_time *tmp)
 	uchar sec, min, hour, mday, wday, mon, year;
 	__maybe_unused uchar a_sec, a_min, a_hour, a_date,
 			     a_mon, a_year, a_armed;
+	int have_retried = 0;
 
 	/* enable access to RTC registers */
 	SetRTC_Access(RTC_ENABLE);
 
 	/* read RTC registers */
 	do {
-		sec  = readb(&rtc->bcdsec);
 		min  = readb(&rtc->bcdmin);
 		hour = readb(&rtc->bcdhour);
 		mday = readb(&rtc->bcddate);
 		wday = readb(&rtc->bcdday);
 		mon  = readb(&rtc->bcdmon);
 		year = readb(&rtc->bcdyear);
-	} while (sec != readb(&rtc->bcdsec));
+		sec  = readb(&rtc->bcdsec);
+		/*
+		 * The only way to work out whether the RTC was mid-update
+		 * when we read it is to check the seconds counter.
+		 * If it's zero, then we re-try the entire read.
+		 */
+	} while (sec == 0 && !have_retried++);
 
 	/* read ALARM registers */
 	a_sec   = readb(&rtc->almsec);
-- 
1.7.9.5

[U-Boot] [PATCH v4 07/11] rtc: Fix rtc_reset() on s3c24x0_rtc

[José Miguel Gonçalves]

rtc_reset() must set the RTC date to the UNIX Epoch.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - None

Changes for v4:
   - None
---
 drivers/rtc/s3c24x0_rtc.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index b31dc53..3fd5cec 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -167,10 +167,17 @@ int rtc_set(struct rtc_time *tmp)
 
 void rtc_reset(void)
 {
-	struct s3c24x0_rtc *rtc = s3c24x0_get_base_rtc();
-
-	writeb((readb(&rtc->rtccon) & ~0x06) | 0x08, &rtc->rtccon);
-	writeb(readb(&rtc->rtccon) & ~(0x08 | 0x01), &rtc->rtccon);
+	static struct rtc_time tmp = {
+		.tm_year = 1970,
+		.tm_mon = 1,
+		.tm_mday = 1,
+		.tm_wday = 4,
+		.tm_hour = 0,
+		.tm_min = 0,
+		.tm_sec = 0,
+	};
+
+	rtc_set(&tmp);
 }
 
 #endif
-- 
1.7.9.5

[U-Boot] [PATCH v4 08/11] rtc: Don't allow setting unsuported years on s3c24x0_rtc

[José Miguel Gonçalves]

This RTC only supports a 100 years range so rtc_set() should not allow setting
years bellow 1970 or above 2069.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - New patch

Changes for v3:
   - None

Changes for v4:
   - None
---
 drivers/rtc/s3c24x0_rtc.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c
index 3fd5cec..bcd6d44 100644
--- a/drivers/rtc/s3c24x0_rtc.c
+++ b/drivers/rtc/s3c24x0_rtc.c
@@ -139,6 +139,11 @@ int rtc_set(struct rtc_time *tmp)
 	       tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 	       tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 #endif
+	if (tmp->tm_year < 1970 || tmp->tm_year > 2069) {
+		puts("ERROR: year should be between 1970 and 2069!\n");
+		return -1;
+	}
+
 	year = bin2bcd(tmp->tm_year % 100);
 	mon  = bin2bcd(tmp->tm_mon);
 	wday = bin2bcd(tmp->tm_wday);
-- 
1.7.9.5

[U-Boot] [PATCH v4 09/11] S3C24XX: Add NAND Flash driver

[José Miguel Gonçalves]

NAND Flash driver with HW ECC for the S3C24XX SoCs.
Currently it only supports SLC NAND chips.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - Coding style cleanup
   - Use of clrsetbits_le32()
   - Use of register bit macros instead of magic numbers

Changes for v3:
   - Removed magic numbers
   - Removed a macro to declare a void printf()
   - Replaced one printf() with a puts()

Changes for v4:
   - Coding style cleanup
   - Use of a struct to store chip private data
   - Replaced u_long by u32
   - Replaced u_char by uint8_t
   - Added error message in s3c_nand_select_chip()
   - Optimization of s3c_nand_hwcontrol()
---
 drivers/mtd/nand/Makefile       |    1 +
 drivers/mtd/nand/s3c24xx_nand.c |  255 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 256 insertions(+)
 create mode 100644 drivers/mtd/nand/s3c24xx_nand.c

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 29dc20e..791ec44 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -60,6 +60,7 @@ COBJS-$(CONFIG_NAND_MXS) += mxs_nand.o
 COBJS-$(CONFIG_NAND_NDFC) += ndfc.o
 COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
 COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
+COBJS-$(CONFIG_NAND_S3C24XX) += s3c24xx_nand.o
 COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o
 COBJS-$(CONFIG_NAND_SPEAR) += spr_nand.o
 COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
diff --git a/drivers/mtd/nand/s3c24xx_nand.c b/drivers/mtd/nand/s3c24xx_nand.c
new file mode 100644
index 0000000..384ffbf
--- /dev/null
+++ b/drivers/mtd/nand/s3c24xx_nand.c
@@ -0,0 +1,255 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * Based on drivers/mtd/nand/s3c64xx.c and U-Boot 1.3.4 from Samsung.
+ * Supports only SLC NAND Flash chips.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <nand.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+#define TACLS_VAL	7	/* CLE & ALE duration setting (0~7) */
+#define TWRPH0_VAL	7	/* TWRPH0 duration setting (0~7) */
+#define TWRPH1_VAL	7	/* TWRPH1 duration setting (0~7) */
+
+#define MAX_CHIPS	2
+
+/* Struct to store NAND chip private data */
+struct s3c_chip_info {
+	int cs;
+};
+
+static void s3c_nand_select_chip(struct mtd_info *mtd, int chip)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+	u32 nfcont;
+
+	nfcont = readl(&nand->nfcont);
+
+	switch (chip) {
+	case -1:
+		nfcont |= NFCONT_NCE1 | NFCONT_NCE0;
+		break;
+	case 0:
+		nfcont &= ~NFCONT_NCE0;
+		break;
+	case 1:
+		nfcont &= ~NFCONT_NCE1;
+		break;
+	default:
+		printf("S3C24XX NAND: Invalid chip select (%d).\n", chip);
+		return;
+	}
+
+	writel(nfcont, &nand->nfcont);
+}
+
+/*
+ * Hardware specific access to control-lines function
+ */
+static void s3c_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+	struct nand_chip *this;
+	const struct s3c_chip_info *info;
+
+	if (ctrl & NAND_CTRL_CHANGE) {
+		if (ctrl & NAND_NCE) {
+			this = mtd->priv;
+			info = this->priv;
+			s3c_nand_select_chip(mtd, info->cs);
+		} else {
+			s3c_nand_select_chip(mtd, -1);
+		}
+	}
+
+	if (cmd == NAND_CMD_NONE)
+		return;
+
+	if (ctrl & NAND_CLE)
+		writeb(cmd, &nand->nfcmmd);
+	else
+		writeb(cmd, &nand->nfaddr);
+}
+
+/*
+ * Function for checking device ready pin
+ */
+static int s3c_nand_device_ready(struct mtd_info *mtdinfo)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+
+	return readl(&nand->nfstat) & NFSTAT_RNB;
+}
+
+#ifdef CONFIG_S3C24XX_NAND_HWECC
+/*
+ * This function is called before encoding ECC codes to ready ECC engine.
+ */
+static void s3c_nand_enable_hwecc(struct mtd_info *mtd, int mode)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+
+	/* Set 1-bit ECC */
+	clrsetbits_le32(&nand->nfconf, NFCONF_ECCTYPE_MASK,
+			NFCONF_ECCTYPE_1BIT);
+
+	/* Initialize & unlock ECC */
+	clrsetbits_le32(&nand->nfcont, NFCONT_MECCLOCK, NFCONT_INITMECC);
+}
+
+/*
+ * This function is called immediately after encoding ECC codes.
+ * This function returns encoded ECC codes.
+ */
+static int s3c_nand_calculate_ecc(struct mtd_info *mtd, const uint8_t *dat,
+				  uint8_t *ecc_code)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+	u32 nfmecc0;
+
+	/* Lock ECC */
+	setbits_le32(&nand->nfcont, NFCONT_MECCLOCK);
+
+	/* Return 1-bit ECC */
+	nfmecc0 = readl(&nand->nfmecc[0]);
+
+	ecc_code[0] = nfmecc0 & 0xff;
+	ecc_code[1] = (nfmecc0 >> 8) & 0xff;
+	ecc_code[2] = (nfmecc0 >> 16) & 0xff;
+	ecc_code[3] = (nfmecc0 >> 24) & 0xff;
+
+	return 0;
+}
+
+/*
+ * This function determines whether read data is good or not.
+ * On SLC, must write ECC codes to controller before reading status bit.
+ * If status bit is good, return 0.
+ * If a correctable error occured, correct it and return 1.
+ * If an uncorrectable error occured, return -1.
+ */
+static int s3c_nand_correct_data(struct mtd_info *mtd, uint8_t *dat,
+				 uint8_t *read_ecc, uint8_t *calc_ecc)
+{
+	struct s3c24xx_nand *const nand = s3c24xx_get_base_nand();
+	int ret;
+	u32 nfeccerr0, nfmeccdata0, nfmeccdata1, err_byte_addr;
+	uint8_t err_type, repaired;
+
+	/* SLC: Write ECC to compare */
+	nfmeccdata0 = (((u32) read_ecc[1]) << 16) | read_ecc[0];
+	nfmeccdata1 = (((u32) read_ecc[3]) << 16) | read_ecc[2];
+	writel(nfmeccdata0, &nand->nfmeccd[0]);
+	writel(nfmeccdata1, &nand->nfmeccd[1]);
+
+	/* Read ECC status */
+	nfeccerr0 = readl(&nand->nfeccerr[0]);
+	err_type = nfeccerr0 & 0x3;
+
+	switch (err_type) {
+	case 0:		/* No error */
+		ret = 0;
+		break;
+
+	case 1:
+		/*
+		 * 1 bit error (Correctable)
+		 * (nfeccerr0 >> 7) & 0x7ff     :error byte number
+		 * (nfeccerr0 >> 4) & 0x7       :error bit number
+		 */
+		err_byte_addr = (nfeccerr0 >> 7) & 0x7ff;
+		repaired = dat[err_byte_addr] ^ (1 << ((nfeccerr0 >> 4) & 0x7));
+
+		printf("S3C24XX NAND: 1 bit error detected at byte %u. "
+		       "Correcting from 0x%02x to 0x%02x\n",
+		       err_byte_addr, dat[err_byte_addr], repaired);
+
+		dat[err_byte_addr] = repaired;
+
+		ret = 1;
+		break;
+
+	case 2:		/* Multiple error */
+	case 3:		/* ECC area error */
+		puts("S3C24XX NAND: ECC uncorrectable error detected.\n");
+		ret = -1;
+		break;
+	}
+
+	return ret;
+}
+#endif /* CONFIG_S3C24XX_NAND_HWECC */
+
+/*
+ * Board-specific NAND initialization.
+ */
+int board_nand_init(struct nand_chip *nand)
+{
+	static const struct s3c_chip_info chip_info[MAX_CHIPS] = { {0}, {1} };
+	static int chip_n;
+	struct s3c24xx_nand *const nand_reg = s3c24xx_get_base_nand();
+
+	if (chip_n == 0) {
+		/* Extend NAND timings to the maximum */
+		clrsetbits_le32(&nand_reg->nfconf,
+				NFCONF_TACLS_MASK | NFCONF_TWRPH0_MASK |
+				NFCONF_TWRPH1_MASK,
+				NFCONF_TACLS(TACLS_VAL) |
+				NFCONF_TWRPH0(TWRPH0_VAL) |
+				NFCONF_TWRPH1(TWRPH1_VAL));
+
+		/* Disable chip selects and soft lock, enable controller */
+		clrsetbits_le32(&nand_reg->nfcont, NFCONT_WP,
+				NFCONT_NCE1 | NFCONT_NCE0 | NFCONT_ENABLE);
+	} else if (chip_n >= MAX_CHIPS) {
+		return -ENODEV;
+	}
+
+	nand->IO_ADDR_R = &nand_reg->nfdata;
+	nand->IO_ADDR_W = &nand_reg->nfdata;
+	nand->cmd_ctrl = s3c_nand_hwcontrol;
+	nand->dev_ready = s3c_nand_device_ready;
+	nand->select_chip = s3c_nand_select_chip;
+	nand->options = 0;
+#ifdef CONFIG_SPL_BUILD
+	nand->read_buf = nand_read_buf;
+#endif
+
+#ifdef CONFIG_S3C24XX_NAND_HWECC
+	nand->ecc.hwctl = s3c_nand_enable_hwecc;
+	nand->ecc.calculate = s3c_nand_calculate_ecc;
+	nand->ecc.correct = s3c_nand_correct_data;
+	nand->ecc.mode = NAND_ECC_HW_OOB_FIRST;
+	nand->ecc.size = CONFIG_SYS_NAND_ECCSIZE;
+	nand->ecc.bytes = CONFIG_SYS_NAND_ECCBYTES;
+#else
+	nand->ecc.mode = NAND_ECC_SOFT;
+#endif /* ! CONFIG_S3C24XX_NAND_HWECC */
+
+	nand->priv = (void *)&chip_info[chip_n++];
+
+	return 0;
+}
-- 
1.7.9.5

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

Samsung's S3C24XX SoCs need this in order to generate a binary image
with a padded SPL concatenated with U-Boot.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - None

Changes for v3:
   - Changed new binary target name from u-boot-ubl.bin to u-boot-pad.bin

Changes for v4:
   - None
---
 Makefile |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8738d55..86dedca 100644
--- a/Makefile
+++ b/Makefile
@@ -433,14 +433,15 @@ $(obj)u-boot.sha1:	$(obj)u-boot.bin
 $(obj)u-boot.dis:	$(obj)u-boot
 		$(OBJDUMP) -d $< > $@
 
-$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+$(obj)u-boot-pad.bin:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 		$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
-		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin
-		$(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
-		-e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl
-		rm $(obj)u-boot-ubl.bin
+		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-pad.bin
 		rm $(obj)spl/u-boot-spl-pad.bin
 
+$(obj)u-boot.ubl:       $(obj)spl/u-boot-pad.bin
+		$(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
+		-e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-pad.bin $(obj)u-boot.ubl
+
 $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
 		$(obj)tools/mkimage -s -n /dev/null -T aisimage \
 			-e $(CONFIG_SPL_TEXT_BASE) \
-- 
1.7.9.5

[U-Boot] [PATCH v4 11/11] S3C24XX: Add support to MINI2416 board

[José Miguel Gonçalves]

The MINI2416 board is based on a Samsung's S3C2416 SoC and has 64MB DDR2 SDRAM,
256MB NAND Flash, a LAN9220 Ethernet Controller and a WM8731 Audio CODEC.
This U-Boot port was implemented and tested on a unit bought to Boardcon
(http://www.armdesigner.com/) but there are some other chinese providers
that can supply it with a selectable NAND chip from 128MB to 1GB.

Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
---
Changes for v2:
   - Coding style cleanup
   - Use of Use of clrbits_le32(), setbits_le32() and clrsetbits_le32()
   - Use of register bit macros instead of magic numbers
   - Use of serial and rtc drivers implemented for s3c24x0

Changes for v3:
   - Changed target name from u-boot-ubl.bin to u-boot-pad.bin
   - Removed magic numbers
   - Changes to support new SPL framework

Changes for v4:
   - None
---
 MAINTAINERS                            |    4 +
 board/boardcon/mini2416/Makefile       |   47 ++++++++
 board/boardcon/mini2416/config.mk      |    4 +
 board/boardcon/mini2416/mini2416.c     |  104 ++++++++++++++++
 board/boardcon/mini2416/mini2416_spl.c |  202 ++++++++++++++++++++++++++++++++
 board/boardcon/mini2416/u-boot-spl.lds |   63 ++++++++++
 boards.cfg                             |    1 +
 include/configs/mini2416.h             |  202 +++++++++++++++++++++++++++++++
 8 files changed, 627 insertions(+)
 create mode 100644 board/boardcon/mini2416/Makefile
 create mode 100644 board/boardcon/mini2416/config.mk
 create mode 100644 board/boardcon/mini2416/mini2416.c
 create mode 100644 board/boardcon/mini2416/mini2416_spl.c
 create mode 100644 board/boardcon/mini2416/u-boot-spl.lds
 create mode 100644 include/configs/mini2416.h

diff --git a/MAINTAINERS b/MAINTAINERS
index c5a6f2f..80ad29e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -653,6 +653,10 @@ Fabio Estevam <fabio.estevam@freescale.com>
 	mx53ard		i.MX53
 	mx53smd		i.MX53
 
+Jos? Gon?alves <jose.goncalves@inov.pt>
+
+	mini2416	ARM926EJS (S3C2416 SoC)
+
 Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
 
 	meesc		ARM926EJS (AT91SAM9263 SoC)
diff --git a/board/boardcon/mini2416/Makefile b/board/boardcon/mini2416/Makefile
new file mode 100644
index 0000000..bf92ba1
--- /dev/null
+++ b/board/boardcon/mini2416/Makefile
@@ -0,0 +1,47 @@
+#
+# (C) Copyright 2012 INOV - INESC Inovacao
+# Jose Goncalves <jose.goncalves@inov.pt>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+ifdef CONFIG_SPL_BUILD
+COBJS	+= mini2416_spl.o
+else
+COBJS	+= mini2416.o
+endif
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/boardcon/mini2416/config.mk b/board/boardcon/mini2416/config.mk
new file mode 100644
index 0000000..ff08568
--- /dev/null
+++ b/board/boardcon/mini2416/config.mk
@@ -0,0 +1,4 @@
+PAD_TO	:= 0x2000
+ifndef CONFIG_SPL_BUILD
+ALL-y += $(obj)u-boot-pad.bin
+endif
diff --git a/board/boardcon/mini2416/mini2416.c b/board/boardcon/mini2416/mini2416.c
new file mode 100644
index 0000000..b2c049b
--- /dev/null
+++ b/board/boardcon/mini2416/mini2416.c
@@ -0,0 +1,104 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <netdev.h>
+#include <asm/io.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+#define SMBIDCY1_VAL	0	/* Idle Cycle */
+#define SMBWSTWR1_VAL	14	/* Write Wait State */
+#define SMBWSTOEN1_VAL	2	/* Output Enable Assertion Delay */
+#define SMBWSTWEN1_VAL	2	/* Write Enable Assertion Delay */
+#define SMBWSTRD1_VAL	14	/* Read Wait State */
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static void ether_if_init(void)
+{
+	/* Ethernet chip is on memory bank 1 */
+	struct s3c24xx_smc *const smc = s3c24xx_get_base_smc(S3C24XX_SMC1);
+	struct s3c24xx_gpio *const gpio = s3c24xx_get_base_gpio();
+
+	/* Set bus timings */
+	writel(SMBIDCY1_VAL, &smc->smbidcy);
+	writel(SMBWSTWR1_VAL, &smc->smbwstwr);
+	writel(SMBWSTOEN1_VAL, &smc->smbwstoen);
+	writel(SMBWSTWEN1_VAL, &smc->smbwstwen);
+	writel(SMBWSTRD1_VAL, &smc->smbwstrd);
+
+	/* Init SMC control register */
+	clrsetbits_le32(&smc->smbc,
+			(SMBC_RSMAVD_WR | SMBC_RSMAVD_RD | SMBC_MW_MASK |
+			 SMBC_WAIT_POL),
+			(SMBC_DRNOWE | SMBC_DRNCS | SMBC_MW_16BIT |
+			 SMBC_WAIT_EN | SMBC_RBLE));
+
+	/* Enable CS pin */
+	setbits_le32(&gpio->gpacon, GPACON_NRCS1);
+}
+
+int board_init(void)
+{
+	struct s3c24xx_gpio *const gpio = s3c24xx_get_base_gpio();
+
+	/* Turn LED on */
+	clrbits_le32(&gpio->gpcdat, GPCDAT(5));
+
+	/* Init interface with Ethernet chip */
+	ether_if_init();
+
+	/* Arch number of MINI2416 Board */
+	gd->bd->bi_arch_number = MACH_TYPE_MINI2416;
+
+	/* Address of boot parameters */
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+	return 0;
+}
+
+int dram_init(void)
+{
+	gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+				    CONFIG_SYS_SDRAM_SIZE);
+	return 0;
+}
+
+#ifdef CONFIG_DISPLAY_BOARDINFO
+int checkboard(void)
+{
+	printf("\nBoard: MINI2416\n");
+	return 0;
+}
+#endif
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+#ifdef CONFIG_SMC911X
+	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+	return rc;
+}
+#endif
diff --git a/board/boardcon/mini2416/mini2416_spl.c b/board/boardcon/mini2416/mini2416_spl.c
new file mode 100644
index 0000000..9e91790
--- /dev/null
+++ b/board/boardcon/mini2416/mini2416_spl.c
@@ -0,0 +1,202 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <version.h>
+#include <nand.h>
+#include <asm/io.h>
+#include <asm/arch/s3c24xx_cpu.h>
+
+/* FCLK = 800 MHz, HCLK = 133 MHz, PCLK = 66 MHz */
+#define M_MDIV	400
+#define M_PDIV	3
+#define M_SDIV	1
+#define ARMDIV	1
+#define PREDIV	2
+#define HCLKDIV	1
+#define M_LTIME	0x0E10
+
+/* EPLLclk = 96MHz */
+#define E_MDIV	32
+#define E_PDIV	1
+#define E_SDIV	2
+#define E_LTIME	0x1780
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static inline void asm_delay(ulong loops)
+{
+	asm volatile ("1:\n" "subs %0, %1, #1\n"
+		      "bne 1b" : "=r" (loops) : "0"(loops));
+}
+
+static inline void watchdog_disable(void)
+{
+	struct s3c24xx_watchdog *const watchdog = s3c24xx_get_base_watchdog();
+
+	writel(WTCON_DISABLE_VAL, &watchdog->wtcon);
+}
+
+static void pinmux_init(void)
+{
+	struct s3c24xx_gpio *const gpio = s3c24xx_get_base_gpio();
+
+	/* Init LED pin and turn LED off (LED on GPC5) */
+	clrsetbits_le32(&gpio->gpccon, GPCCON_MASK(5), GPCCON_OUTPUT(5));
+	setbits_le32(&gpio->gpcdat, GPCDAT(5));
+
+	/* Init UART pins */
+	clrsetbits_le32(&gpio->gphcon, GPHCON_MASK(0) | GPHCON_MASK(1) |
+			GPHCON_MASK(2) | GPHCON_MASK(3) | GPHCON_MASK(4) |
+			GPHCON_MASK(5) | GPHCON_MASK(6) | GPHCON_MASK(7),
+			GPHCON_TXD(0) | GPHCON_RXD(0) | GPHCON_TXD(1) |
+			GPHCON_RXD(1) | GPHCON_TXD(2) | GPHCON_RXD(2) |
+			GPHCON_TXD(3) | GPHCON_RXD(3));
+
+	/* Init NAND interface */
+	setbits_le32(&gpio->gpacon, GPACON_CLE | GPACON_ALE | GPACON_NFWE |
+		     GPACON_NFRE | GPACON_NRSTOUT | GPACON_NFCE);
+}
+
+static void pll_init(void)
+{
+	struct s3c2416_sysctl *const sysctl = s3c2416_get_base_sysctl();
+
+	/* Configure clocks division ratio */
+	clrsetbits_le32(&sysctl->clkdiv0,
+			CLKDIV0_ARMDIV_MASK | CLKDIV0_PREDIV_MASK |
+			CLKDIV0_HCLKDIV_MASK,
+			CLKDIV0_ARMDIV(ARMDIV) | CLKDIV0_PREDIV(PREDIV) |
+			CLKDIV0_HALFHCLK | CLKDIV0_PCLKDIV |
+			CLKDIV0_HCLKDIV(HCLKDIV));
+
+	/* Set MPLL lock time */
+	writel(M_LTIME, &sysctl->lockcon0);
+
+	/* Configure MPLL */
+	writel(MPLLCON_MDIV(M_MDIV) | MPLLCON_PDIV(M_PDIV) |
+	       PLLCON_SDIV(M_SDIV), &sysctl->mpllcon);
+
+	/* Set EPLL lock time */
+	writel(E_LTIME, &sysctl->lockcon1);
+
+	/* Configure EPLL */
+	writel(EPLLCON_MDIV(E_MDIV) | EPLLCON_PDIV(E_PDIV) |
+	       PLLCON_SDIV(E_SDIV), &sysctl->epllcon);
+
+	/* MSYSCLK = MPLL and ESYSCLK = EPLL */
+	setbits_le32(&sysctl->clksrc,
+		     CLKSRC_MSYSCLK_MPLL | CLKSRC_ESYSCLK_EPLL);
+}
+
+static void dramctl_init(void)
+{
+	struct s3c24xx_dramctl *const dramctl = s3c24xx_get_base_dramctl();
+
+	/* Step 1: Init BANKCFG & BANKCON1 */
+	writel(BANKCFG_VAL_DDR2, &dramctl->bankcfg);
+	writel(BANKCON1_VAL_DDR2, &dramctl->bankcon1);
+
+	/* Step 2: Init BANKCON2 */
+	writel(BANKCON2_VAL_DDR2, &dramctl->bankcon2);
+
+	/* Step 3: Issue a PALL command */
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_PALL, &dramctl->bankcon1);
+
+	/* Step 4: Issue a EMRS2 command */
+	writel(BANKCON3_VAL_EMRS2, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_EMRS, &dramctl->bankcon1);
+
+	/* Step 5: Issue a EMRS3 command */
+	writel(BANKCON3_VAL_EMRS3, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_EMRS, &dramctl->bankcon1);
+
+	/* Step 6: Issue a EMRS1 command */
+	writel(BANKCON3_VAL_EMRS1, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_EMRS, &dramctl->bankcon1);
+
+	/* Step 7: Issue a MRS command */
+	writel(BANKCON3_VAL_MRS | BANKCON3_MRS_DLL_RESET, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_MRS, &dramctl->bankcon1);
+
+	/* Step 8: Issue a PALL command */
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_PALL, &dramctl->bankcon1);
+
+	/* Step 9: Write 0xFF into the refresh timer */
+	writel(0xFF, &dramctl->refresh);
+
+	/* Step 10: Wait more than 120 clocks */
+	asm_delay(256);
+
+	/* Step 11: Issue a MRS command */
+	writel(BANKCON3_VAL_MRS, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_MRS, &dramctl->bankcon1);
+
+	/* Step 12: Issue a EMRS1 command */
+	writel(BANKCON3_VAL_EMRS1 | BANKCON3_EMRS1_OCD7 | BANKCON3_EMRS1_CAS3,
+	       &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_EMRS, &dramctl->bankcon1);
+
+	writel(BANKCON3_VAL_EMRS1 | BANKCON3_EMRS1_CAS3, &dramctl->bankcon3);
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_EMRS, &dramctl->bankcon1);
+
+	/* Step 13: Write 0x87 into the refresh timer */
+	writel(0x87, &dramctl->refresh);
+
+	/* Step 14: Normal Mode */
+	writel(BANKCON1_VAL_DDR2 | BANKCON1_INIT_NORMAL, &dramctl->bankcon1);
+}
+
+#ifndef CONFIG_SPL_LIBCOMMON_SUPPORT
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+void puts(const char *str)
+{
+	serial_puts(str);
+}
+#else
+void puts(const char *str)
+{
+}
+#endif
+#endif
+
+void spl_board_init(void)
+{
+	watchdog_disable();
+	pinmux_init();
+	pll_init();
+	preloader_console_init();
+	dramctl_init();
+}
+
+u32 spl_boot_device(void)
+{
+#ifdef CONFIG_SPL_NAND_SIMPLE
+	puts("Loading U-Boot from NAND Flash...\n");
+	return BOOT_DEVICE_NAND;
+#else
+	puts("Unknown boot device\n");
+	hang();
+#endif
+}
diff --git a/board/boardcon/mini2416/u-boot-spl.lds b/board/boardcon/mini2416/u-boot-spl.lds
new file mode 100644
index 0000000..d339b0d
--- /dev/null
+++ b/board/boardcon/mini2416/u-boot-spl.lds
@@ -0,0 +1,63 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+MEMORY { .iram : ORIGIN = CONFIG_SPL_TEXT_BASE, \
+                 LENGTH = CONFIG_SPL_MAX_SIZE }
+MEMORY { .sram : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
+                 LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+ENTRY(_start)
+SECTIONS
+{
+	.text :
+	{
+		CPUDIR/start.o (.text)
+		*(.text*)
+	} > .iram
+
+	. = ALIGN(4);
+	.rodata :
+	{
+		*(SORT_BY_ALIGNMENT(.rodata*))
+	} > .iram
+
+	. = ALIGN(4);
+	.data :
+	{
+		*(SORT_BY_ALIGNMENT(.data*))
+	} > .iram
+
+	. = ALIGN(4);
+	_end = .;
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start = .;
+		*(.bss*)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} >.sram
+}
diff --git a/boards.cfg b/boards.cfg
index fdb84ad..823d5e6 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -185,6 +185,7 @@ omap730p2_cs0boot	     arm         arm926ejs   omap730p2		 ti             omap
 omap730p2_cs3boot	     arm         arm926ejs   omap730p2		 ti             omap        omap730p2:CS3_BOOT
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
+mini2416                     arm         arm926ejs   mini2416            boardcon       s3c24xx
 spear300                     arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300
 spear300_nand                arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300,nand
 spear300_usbtty              arm         arm926ejs   spear300            spear          spear       spear3xx_evb:spear300,usbtty
diff --git a/include/configs/mini2416.h b/include/configs/mini2416.h
new file mode 100644
index 0000000..5c51f90
--- /dev/null
+++ b/include/configs/mini2416.h
@@ -0,0 +1,202 @@
+/*
+ * (C) Copyright 2012 INOV - INESC Inovacao
+ * Jose Goncalves <jose.goncalves@inov.pt>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/*
+ * SoC Configuration
+ */
+#define CONFIG_ARM926EJS	/* ARM926EJS CPU Core */
+#define CONFIG_S3C24XX		/* SAMSUNG S3C24XX Family */
+#define CONFIG_S3C2416		/* SAMSUNG S3C2416 SoC */
+#define CONFIG_SYS_CLK_FREQ	12000000
+#define CONFIG_SYS_HZ		1000
+
+/*
+ * Memory Information
+ */
+#define CONFIG_SYS_IRAM_BASE	0x00000000	/* Steppingstone base address */
+#define CONFIG_SYS_IRAM_SIZE	(8 << 10)	/* 8KB of Steppingstone */
+#define CONFIG_SYS_IRAM_END	(CONFIG_SYS_IRAM_BASE + CONFIG_SYS_IRAM_SIZE)
+
+#define CONFIG_SYS_SRAM_BASE	0x00002000	/* SRAM base address */
+#define CONFIG_SYS_SRAM_SIZE	(56 << 10)	/* 56KB of SRAM */
+#define CONFIG_SYS_SRAM_END	(CONFIG_SYS_SRAM_BASE + CONFIG_SYS_SRAM_SIZE)
+
+#define CONFIG_SYS_SDRAM_BASE	0x30000000	/* DDR2 SDRAM base address */
+#define CONFIG_SYS_SDRAM_SIZE	(64 << 20)	/* 64MB of DDR2 SDRAM */
+#define CONFIG_SYS_SDRAM_END	(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE)
+
+/*
+ * Linux Interface
+ */
+#define MACH_TYPE_MINI2416		3850
+#define CONFIG_MACH_TYPE		MACH_TYPE_MINI2416
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_BOOTDELAY		3
+#define CONFIG_BOOTARGS			"console=ttySAC3,115200n8"
+#define CONFIG_BOOTCOMMAND		""	/* TBD */
+
+/*
+ * SPL
+ */
+#define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_NAND_SIMPLE
+#define CONFIG_SPL_TEXT_BASE		0x00000000 /* CONFIG_SYS_IRAM_BASE */
+#define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_IRAM_SIZE
+#define CONFIG_SPL_BSS_START_ADDR	CONFIG_SYS_SRAM_BASE
+#define CONFIG_SPL_BSS_MAX_SIZE		(CONFIG_SYS_SRAM_SIZE - (8 << 10))
+#define CONFIG_SPL_STACK		CONFIG_SYS_SRAM_END /* 8KB for stack */
+
+/*
+ * Monitor Interface
+ */
+#define CONFIG_SYS_PROMPT               "MINI2416 # "
+#define CONFIG_SYS_LONGHELP
+#define	CONFIG_SYS_CBSIZE		1024
+#define CONFIG_SYS_PBSIZE               (CONFIG_SYS_CBSIZE + \
+					sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS		16
+#define CONFIG_CMDLINE_EDITING
+
+/*
+ * Command Definition
+ */
+#define CONFIG_SYS_NO_FLASH	/* No NOR Flash */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MISC
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_PING
+
+/*
+ * Miscellaneous Settings
+ */
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + (1 << 20))
+#define CONFIG_SYS_MONITOR_BASE		(CONFIG_SYS_SDRAM_END - (1 << 20))
+#define CONFIG_SYS_MONITOR_LEN		(256 << 10)
+#define CONFIG_SYS_TEXT_BASE		0x33F00000 /* CONFIG_SYS_MONITOR_BASE */
+#define CONFIG_SYS_MALLOC_LEN		(384 << 10)
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SRAM_END - \
+					GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_ALT_MEMTEST
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_MEMTEST_END		CONFIG_SYS_MONITOR_BASE
+
+/*
+ * NAND Flash
+ */
+#ifdef CONFIG_CMD_NAND
+
+#define CONFIG_NAND_S3C24XX
+#define CONFIG_S3C24XX_NAND_HWECC
+#define CONFIG_SYS_NAND_BASE		0x4E000010
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+
+/* SPL NAND Driver */
+#define CONFIG_SYS_NAND_PAGE_SIZE	(2 << 10)
+#define CONFIG_SYS_NAND_BLOCK_SIZE	(128 << 10)
+#define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
+					CONFIG_SYS_NAND_PAGE_SIZE)
+#define CONFIG_SYS_NAND_OOBSIZE		64
+#define CONFIG_SYS_NAND_ECCSIZE		512
+#define CONFIG_SYS_NAND_ECCBYTES	4
+#define CONFIG_SYS_NAND_ECCPOS		{40, 41, 42, 43, 44, 45, 46, 47, \
+					 48, 49, 50, 51, 52, 53, 54, 55}
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
+#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
+#define CONFIG_SYS_NAND_U_BOOT_DST	CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_NAND_U_BOOT_DST
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	CONFIG_SPL_MAX_SIZE
+#define CONFIG_SYS_NAND_U_BOOT_SIZE	(CONFIG_SYS_MONITOR_LEN - \
+					 CONFIG_SPL_MAX_SIZE)
+
+#endif
+
+/*
+ * Serial Driver
+ */
+#define CONFIG_S3C24X0_SERIAL
+#define CONFIG_SERIAL3
+#define CONFIG_BAUDRATE			115200
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+
+/*
+ * Ethernet
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_BASE		0x08000000
+#define CONFIG_SMC911X_16_BIT
+#define CONFIG_ETHADDR			FE:11:22:33:44:55
+#define CONFIG_OVERWRITE_ETHADDR_ONCE
+#define CONFIG_IPADDR			192.168.0.10
+#define CONFIG_NETMASK			255.255.255.0
+#define CONFIG_SERVERIP			192.168.0.1
+#define CONFIG_GATEWAYIP		192.168.0.1
+#endif
+
+/*
+ * RTC
+ */
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_S3C24X0
+#endif
+
+/*
+ * Environment
+ */
+#ifdef CONFIG_CMD_NAND
+#define	CONFIG_ENV_IS_IN_NAND
+#define	CONFIG_ENV_SIZE			CONFIG_SYS_NAND_BLOCK_SIZE
+#define	CONFIG_ENV_OFFSET		CONFIG_SYS_MONITOR_LEN
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
+#define	CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+#else
+#define CONFIG_ENV_IS_NOWHERE
+#endif
+
+/*
+ * File System
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#endif
+
+#endif /* __CONFIG_H */
-- 
1.7.9.5

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> Samsung's S3C24XX SoCs need this in order to generate a binary image
> with a padded SPL concatenated with U-Boot.

I still think "pad" is a lousy name for this.  It refers to a minor  
implementation detail of how the image was put together.

If you don't like the suggestions in  
http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how  
about
"u-boot-with-spl.bin"?

-Scott

[U-Boot] [PATCH v4 09/11] S3C24XX: Add NAND Flash driver

[Scott Wood]

On 09/19/2012 06:25:25 AM, Jos? Miguel Gon?alves wrote:
> NAND Flash driver with HW ECC for the S3C24XX SoCs.
> Currently it only supports SLC NAND chips.
> 
> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
> ---
> Changes for v2:
>    - Coding style cleanup
>    - Use of clrsetbits_le32()
>    - Use of register bit macros instead of magic numbers
> 
> Changes for v3:
>    - Removed magic numbers
>    - Removed a macro to declare a void printf()
>    - Replaced one printf() with a puts()
> 
> Changes for v4:
>    - Coding style cleanup
>    - Use of a struct to store chip private data
>    - Replaced u_long by u32
>    - Replaced u_char by uint8_t
>    - Added error message in s3c_nand_select_chip()
>    - Optimization of s3c_nand_hwcontrol()
> ---
>  drivers/mtd/nand/Makefile       |    1 +
>  drivers/mtd/nand/s3c24xx_nand.c |  255  
> +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 256 insertions(+)
>  create mode 100644 drivers/mtd/nand/s3c24xx_nand.c

Acked-by: Scott Wood <scottwood@freescale.com>

> +	nand->priv = (void *)&chip_info[chip_n++];

Hmm, I was going to say that the cast could be dropped, but I guess  
it's because of the const.  It doesn't need to hold up acceptance of  
the patch, but it'd probably be better to drop the const instead (more  
flexible too if additional private data needs to be declared).

-Scott

[U-Boot] [PATCH v4 09/11] S3C24XX: Add NAND Flash driver

[José Miguel Gonçalves]

On 19-09-2012 17:19, Scott Wood wrote:
> On 09/19/2012 06:25:25 AM, Jos? Miguel Gon?alves wrote:
>> NAND Flash driver with HW ECC for the S3C24XX SoCs.
>> Currently it only supports SLC NAND chips.
>>
>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
>> ---
>> Changes for v2:
>>    - Coding style cleanup
>>    - Use of clrsetbits_le32()
>>    - Use of register bit macros instead of magic numbers
>>
>> Changes for v3:
>>    - Removed magic numbers
>>    - Removed a macro to declare a void printf()
>>    - Replaced one printf() with a puts()
>>
>> Changes for v4:
>>    - Coding style cleanup
>>    - Use of a struct to store chip private data
>>    - Replaced u_long by u32
>>    - Replaced u_char by uint8_t
>>    - Added error message in s3c_nand_select_chip()
>>    - Optimization of s3c_nand_hwcontrol()
>> ---
>>  drivers/mtd/nand/Makefile       |    1 +
>>  drivers/mtd/nand/s3c24xx_nand.c |  255 +++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 256 insertions(+)
>>  create mode 100644 drivers/mtd/nand/s3c24xx_nand.c
>
> Acked-by: Scott Wood <scottwood@freescale.com>
>
>> +    nand->priv = (void *)&chip_info[chip_n++];
>
> Hmm, I was going to say that the cast could be dropped, but I guess it's because 
> of the const. 

Yes, it's needed because of the declaration of the private struct as const.

> It doesn't need to hold up acceptance of the patch, but it'd probably be better 
> to drop the const instead (more flexible too if additional private data needs to 
> be declared).

I think a better option would be to drop the const in the struct and set only the 
'cs' member to const.

Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

On 19-09-2012 17:10, Scott Wood wrote:
> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>> Samsung's S3C24XX SoCs need this in order to generate a binary image
>> with a padded SPL concatenated with U-Boot.
>
> I still think "pad" is a lousy name for this.  It refers to a minor 
> implementation detail of how the image was put together.
>
> If you don't like the suggestions in 
> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how about
> "u-boot-with-spl.bin"?

I used a suggestion made by Christian Riesch and accepted by Tom Rini.

I'm totally cool with any name that the U-Boot core maintainers would like to use, 
though I would prefer a shorter name than "u-boot-with-spl.bin" because I'm lazy 
and don't like to type too many keys when I upgrade by tftp :-) Because of that I 
think I would prefer "u-boot-all.bin". So, everybody agrees with that name?

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/19/2012 11:58:06 AM, Jos? Miguel Gon?alves wrote:
> On 19-09-2012 17:10, Scott Wood wrote:
>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>> Samsung's S3C24XX SoCs need this in order to generate a binary image
>>> with a padded SPL concatenated with U-Boot.
>> 
>> I still think "pad" is a lousy name for this.  It refers to a minor  
>> implementation detail of how the image was put together.
>> 
>> If you don't like the suggestions in  
>> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html,  
>> how about
>> "u-boot-with-spl.bin"?
> 
> I used a suggestion made by Christian Riesch and accepted by Tom Rini.
> 
> I'm totally cool with any name that the U-Boot core maintainers would  
> like to use, though I would prefer a shorter name than  
> "u-boot-with-spl.bin" because I'm lazy and don't like to type too  
> many keys when I upgrade by tftp :-) Because of that I think I would  
> prefer "u-boot-all.bin". So, everybody agrees with that name?

setenv uboot pathname/u-boot-with-as-much-verbosity-as-you-want.bin
setenv tftpnand 'tftp $loadaddr $uboot && nand erase 0 $filesize &&  
nand write $loadaddr 0 $filesize'
saveenv
run tftpnand

:-)

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Stephen Warren]

On 09/19/2012 10:58 AM, Jos? Miguel Gon?alves wrote:
> On 19-09-2012 17:10, Scott Wood wrote:
>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>> Samsung's S3C24XX SoCs need this in order to generate a binary image
>>> with a padded SPL concatenated with U-Boot.
>>
>> I still think "pad" is a lousy name for this.  It refers to a minor
>> implementation detail of how the image was put together.
>>
>> If you don't like the suggestions in
>> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how
>> about
>> "u-boot-with-spl.bin"?
> 
> I used a suggestion made by Christian Riesch and accepted by Tom Rini.
> 
> I'm totally cool with any name that the U-Boot core maintainers would
> like to use, though I would prefer a shorter name than
> "u-boot-with-spl.bin" because I'm lazy and don't like to type too many
> keys when I upgrade by tftp :-) Because of that I think I would prefer
> "u-boot-all.bin". So, everybody agrees with that name?

Hmmm. What does "all" mean? It's not that descriptive.

On Tegra we currently have:

u-boot-spl.bin - just SPL.
u-boot.bin - just main U-Boot, I think.
u-boot-dtb.bin - main U-Boot plus an appended DTB, I think.
u-boot-dtb-tegra.bin - SPL+U-Boot+DTB.

Also, some have argued that they want to append a DTB outside the U-Boot
build process, so does "all" include SPL+U-Boot or SPL+U-Boot+DTB, or ...?

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

On 19-09-2012 18:08, Scott Wood wrote:
> On 09/19/2012 11:58:06 AM, Jos? Miguel Gon?alves wrote:
>> On 19-09-2012 17:10, Scott Wood wrote:
>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>>> Samsung's S3C24XX SoCs need this in order to generate a binary image
>>>> with a padded SPL concatenated with U-Boot.
>>>
>>> I still think "pad" is a lousy name for this.  It refers to a minor 
>>> implementation detail of how the image was put together.
>>>
>>> If you don't like the suggestions in 
>>> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how about
>>> "u-boot-with-spl.bin"?
>>
>> I used a suggestion made by Christian Riesch and accepted by Tom Rini.
>>
>> I'm totally cool with any name that the U-Boot core maintainers would like to 
>> use, though I would prefer a shorter name than "u-boot-with-spl.bin" because 
>> I'm lazy and don't like to type too many keys when I upgrade by tftp :-) 
>> Because of that I think I would prefer "u-boot-all.bin". So, everybody agrees 
>> with that name?
>
> setenv uboot pathname/u-boot-with-as-much-verbosity-as-you-want.bin
> setenv tftpnand 'tftp $loadaddr $uboot && nand erase 0 $filesize && nand write 
> $loadaddr 0 $filesize'
> saveenv
> run tftpnand

I already had a script but only for the nand programming part.
I suppose the '&&' on the command line is for conditional execution, right?
In my u-boot that does not work, but looking at the README, I see that I need 
CONFIG_SYS_HUSH_PARSER for it.
I'll give it a try. Thanks!

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

On Wed, Sep 19, 2012 at 11:11:08AM -0600, Stephen Warren wrote:
> On 09/19/2012 10:58 AM, Jos? Miguel Gon?alves wrote:
> > On 19-09-2012 17:10, Scott Wood wrote:
> >> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> >>> Samsung's S3C24XX SoCs need this in order to generate a binary image
> >>> with a padded SPL concatenated with U-Boot.
> >>
> >> I still think "pad" is a lousy name for this.  It refers to a minor
> >> implementation detail of how the image was put together.
> >>
> >> If you don't like the suggestions in
> >> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how
> >> about
> >> "u-boot-with-spl.bin"?
> > 
> > I used a suggestion made by Christian Riesch and accepted by Tom Rini.

Sorry for the churn, really, but..

> > I'm totally cool with any name that the U-Boot core maintainers would
> > like to use, though I would prefer a shorter name than
> > "u-boot-with-spl.bin" because I'm lazy and don't like to type too many
> > keys when I upgrade by tftp :-) Because of that I think I would prefer
> > "u-boot-all.bin". So, everybody agrees with that name?
> 
> Hmmm. What does "all" mean? It's not that descriptive.
> 
> On Tegra we currently have:
> 
> u-boot-spl.bin - just SPL.
> u-boot.bin - just main U-Boot, I think.
> u-boot-dtb.bin - main U-Boot plus an appended DTB, I think.
> u-boot-dtb-tegra.bin - SPL+U-Boot+DTB.

As this, and other examples show, there's not really good generic names.
Go with u-boot.s3c24xx as the target and output, please.  This is
consistent with the other targets and outputs where we throw something
that identifies the SoC/etc into the target/name.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120919/8a687c3a/attachment.pgp>

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/19/2012 01:19:45 PM, Tom Rini wrote:
> On Wed, Sep 19, 2012 at 11:11:08AM -0600, Stephen Warren wrote:
> > On 09/19/2012 10:58 AM, Jos? Miguel Gon?alves wrote:
> > > On 19-09-2012 17:10, Scott Wood wrote:
> > >> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> > >>> Samsung's S3C24XX SoCs need this in order to generate a binary  
> image
> > >>> with a padded SPL concatenated with U-Boot.
> > >>
> > >> I still think "pad" is a lousy name for this.  It refers to a  
> minor
> > >> implementation detail of how the image was put together.
> > >>
> > >> If you don't like the suggestions in
> > >>  
> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how
> > >> about
> > >> "u-boot-with-spl.bin"?
> > >
> > > I used a suggestion made by Christian Riesch and accepted by Tom  
> Rini.
> 
> Sorry for the churn, really, but..
> 
> > > I'm totally cool with any name that the U-Boot core maintainers  
> would
> > > like to use, though I would prefer a shorter name than
> > > "u-boot-with-spl.bin" because I'm lazy and don't like to type too  
> many
> > > keys when I upgrade by tftp :-) Because of that I think I would  
> prefer
> > > "u-boot-all.bin". So, everybody agrees with that name?
> >
> > Hmmm. What does "all" mean? It's not that descriptive.
> >
> > On Tegra we currently have:
> >
> > u-boot-spl.bin - just SPL.
> > u-boot.bin - just main U-Boot, I think.
> > u-boot-dtb.bin - main U-Boot plus an appended DTB, I think.
> > u-boot-dtb-tegra.bin - SPL+U-Boot+DTB.
> 
> As this, and other examples show, there's not really good generic  
> names.
> Go with u-boot.s3c24xx as the target and output, please.  This is
> consistent with the other targets and outputs where we throw something
> that identifies the SoC/etc into the target/name.

So we're just going to duplicate this rule with a different name for  
every target that just needs a simple concatenation?  Like the bad old  
days of having a rule for every target in the makefile?  Come on.

Plus, I don't like using a semi-generic name in the output file because  
it then looks to the user as if this is a U-Boot that covers that  
entire family of devices, rather than just the target it was built  
for.  At least with fully generic names like "u-boot.bin" it should be  
obvious to most people that it doesn't cover every single target.  If  
we must have a non-generic output name, base it on the actual target  
name using a pattern rule -- but I do not see what's wrong with a  
generic name.  Not necessarily something that works for every target --  
that's a strawman -- just something that describes the output of this  
rule in a way that isn't overly specific.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

On 19-09-2012 19:19, Tom Rini wrote:
> On Wed, Sep 19, 2012 at 11:11:08AM -0600, Stephen Warren wrote:
>> On 09/19/2012 10:58 AM, Jos? Miguel Gon?alves wrote:
>>> On 19-09-2012 17:10, Scott Wood wrote:
>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>>>> Samsung's S3C24XX SoCs need this in order to generate a binary image
>>>>> with a padded SPL concatenated with U-Boot.
>>>> I still think "pad" is a lousy name for this.  It refers to a minor
>>>> implementation detail of how the image was put together.
>>>>
>>>> If you don't like the suggestions in
>>>> http://lists.denx.de/pipermail/u-boot/2012-September/134191.html, how
>>>> about
>>>> "u-boot-with-spl.bin"?
>>> I used a suggestion made by Christian Riesch and accepted by Tom Rini.
> Sorry for the churn, really, but..
>
>>> I'm totally cool with any name that the U-Boot core maintainers would
>>> like to use, though I would prefer a shorter name than
>>> "u-boot-with-spl.bin" because I'm lazy and don't like to type too many
>>> keys when I upgrade by tftp :-) Because of that I think I would prefer
>>> "u-boot-all.bin". So, everybody agrees with that name?
>> Hmmm. What does "all" mean? It's not that descriptive.
>>
>> On Tegra we currently have:
>>
>> u-boot-spl.bin - just SPL.
>> u-boot.bin - just main U-Boot, I think.
>> u-boot-dtb.bin - main U-Boot plus an appended DTB, I think.
>> u-boot-dtb-tegra.bin - SPL+U-Boot+DTB.
> As this, and other examples show, there's not really good generic names.
> Go with u-boot.s3c24xx as the target and output, please.  This is
> consistent with the other targets and outputs where we throw something
> that identifies the SoC/etc into the target/name.
>

I'm fine with throwing something that identifies the SoC into the u-boot image name.
In that case I would suggest using instead "u-boot.s3c", because, AFAIK, all 
Samsung's S3C SoCs that support NAND/SD boot through an internal ROM use raw 
images to boot and would be fine with this format. Nevertheless, before I proceed 
with the change, a confirmation for this from someone with a better knowledge of 
Samsung SoCs would be nice...

[U-Boot] [PATCH v4 11/11] S3C24XX: Add support to MINI2416 board

[Tom Rini]

On Wed, Sep 19, 2012 at 12:25:27PM +0100, Jos?? Miguel Gon??alves wrote:
> The MINI2416 board is based on a Samsung's S3C2416 SoC and has 64MB DDR2 SDRAM,
> 256MB NAND Flash, a LAN9220 Ethernet Controller and a WM8731 Audio CODEC.
> This U-Boot port was implemented and tested on a unit bought to Boardcon
> (http://www.armdesigner.com/) but there are some other chinese providers
> that can supply it with a selectable NAND chip from 128MB to 1GB.
> 
> Signed-off-by: Jos?? Miguel Gon??alves <jose.goncalves@inov.pt>
> ---
> Changes for v2:
>    - Coding style cleanup

There's still at least one #define[tab]NAME in the code, please
checkpatch.pl the whole series.

> +#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }

This is in the defaults now, please remove.

-- 
Tom

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

On Wed, Sep 19, 2012 at 01:36:50PM -0500, Scott Wood wrote:
> On 09/19/2012 01:19:45 PM, Tom Rini wrote:
> >On Wed, Sep 19, 2012 at 11:11:08AM -0600, Stephen Warren wrote:
> >> On 09/19/2012 10:58 AM, Jos? Miguel Gon?alves wrote:
> >> > On 19-09-2012 17:10, Scott Wood wrote:
> >> >> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> >> >>> Samsung's S3C24XX SoCs need this in order to generate a
> >binary image
> >> >>> with a padded SPL concatenated with U-Boot.
> >> >>
> >> >> I still think "pad" is a lousy name for this.  It refers to a
> >minor
> >> >> implementation detail of how the image was put together.
> >> >>
> >> >> If you don't like the suggestions in
> >> >>
> >http://lists.denx.de/pipermail/u-boot/2012-September/134191.html,
> >how
> >> >> about
> >> >> "u-boot-with-spl.bin"?
> >> >
> >> > I used a suggestion made by Christian Riesch and accepted by
> >Tom Rini.
> >
> >Sorry for the churn, really, but..
> >
> >> > I'm totally cool with any name that the U-Boot core
> >maintainers would
> >> > like to use, though I would prefer a shorter name than
> >> > "u-boot-with-spl.bin" because I'm lazy and don't like to type
> >too many
> >> > keys when I upgrade by tftp :-) Because of that I think I
> >would prefer
> >> > "u-boot-all.bin". So, everybody agrees with that name?
> >>
> >> Hmmm. What does "all" mean? It's not that descriptive.
> >>
> >> On Tegra we currently have:
> >>
> >> u-boot-spl.bin - just SPL.
> >> u-boot.bin - just main U-Boot, I think.
> >> u-boot-dtb.bin - main U-Boot plus an appended DTB, I think.
> >> u-boot-dtb-tegra.bin - SPL+U-Boot+DTB.
> >
> >As this, and other examples show, there's not really good generic
> >names.
> >Go with u-boot.s3c24xx as the target and output, please.  This is
> >consistent with the other targets and outputs where we throw something
> >that identifies the SoC/etc into the target/name.
> 
> So we're just going to duplicate this rule with a different name for
> every target that just needs a simple concatenation?  Like the bad
> old days of having a rule for every target in the makefile?  Come
> on.
> 
> Plus, I don't like using a semi-generic name in the output file
> because it then looks to the user as if this is a U-Boot that covers
> that entire family of devices, rather than just the target it was
> built for.  At least with fully generic names like "u-boot.bin" it
> should be obvious to most people that it doesn't cover every single
> target.  If we must have a non-generic output name, base it on the
> actual target name using a pattern rule -- but I do not see what's
> wrong with a generic name.  Not necessarily something that works for
> every target -- that's a strawman -- just something that describes
> the output of this rule in a way that isn't overly specific.

I suck at naming.  I admit it.  And I've written, read, rewritten a
reply a few times now.  So, lets go with this.  u-boot.bin is the "I
just need u-boot, in binary form, to boot".  Lets try
u-boot-with-spl.bin as "I just need spl, some padding and u-boot, as
bins, to boot".

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120919/4773dd16/attachment.pgp>

[U-Boot] [PATCH v4 11/11] S3C24XX: Add support to MINI2416 board

[José Miguel Gonçalves]

On 09/19/2012 08:18 PM, Tom Rini wrote:
> On Wed, Sep 19, 2012 at 12:25:27PM +0100, Jos?? Miguel Gon??alves wrote:
>> The MINI2416 board is based on a Samsung's S3C2416 SoC and has 64MB DDR2 SDRAM,
>> 256MB NAND Flash, a LAN9220 Ethernet Controller and a WM8731 Audio CODEC.
>> This U-Boot port was implemented and tested on a unit bought to Boardcon
>> (http://www.armdesigner.com/) but there are some other chinese providers
>> that can supply it with a selectable NAND chip from 128MB to 1GB.
>>
>> Signed-off-by: Jos?? Miguel Gon??alves <jose.goncalves@inov.pt>
>> ---
>> Changes for v2:
>>     - Coding style cleanup
> There's still at least one #define[tab]NAME in the code, please
> checkpatch.pl the whole series.

I've done that!
I only get the warnings/errors that are justified on the cover letter 
(in the v3 changes), i.e., one were I followed a pre-existent coding style:

$ tools/checkpatch.pl 
../0002-S3C24XX-Add-core-support-for-Samsung-s-S3C24XX-SoCs.patch
WARNING: please, no spaces at the start of a line
#1719: FILE: include/common.h:631:
+    defined(CONFIG_S3C24XX) || \$

total: 0 errors, 1 warnings, 1587 lines checked

and another that is a false positive in the Ethernet address 
definitionin the config file;

$ tools/checkpatch.pl ../0011-S3C24XX-Add-support-to-MINI2416-board.patch
ERROR: spaces required around that ':' (ctx:VxV)
#694: FILE: include/configs/mini2416.h:165:
+#define CONFIG_ETHADDR            FE:11:22:33:44:55
                                         ^

ERROR: spaces required around that ':' (ctx:VxV)
#694: FILE: include/configs/mini2416.h:165:
+#define CONFIG_ETHADDR            FE:11:22:33:44:55
                                            ^

ERROR: spaces required around that ':' (ctx:VxV)
#694: FILE: include/configs/mini2416.h:165:
+#define CONFIG_ETHADDR            FE:11:22:33:44:55
                                               ^

ERROR: spaces required around that ':' (ctx:VxV)
#694: FILE: include/configs/mini2416.h:165:
+#define CONFIG_ETHADDR            FE:11:22:33:44:55
                                                  ^

total: 4 errors, 0 warnings, 639 lines checked


>
>> +#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
> This is in the defaults now, please remove.
>

OK.

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> Samsung's S3C24XX SoCs need this in order to generate a binary image
> with a padded SPL concatenated with U-Boot.
> 
> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
> ---
> Changes for v2:
>    - None
> 
> Changes for v3:
>    - Changed new binary target name from u-boot-ubl.bin to  
> u-boot-pad.bin
> 
> Changes for v4:
>    - None
> ---
>  Makefile |   11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 8738d55..86dedca 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -433,14 +433,15 @@ $(obj)u-boot.sha1:	$(obj)u-boot.bin
>  $(obj)u-boot.dis:	$(obj)u-boot
>  		$(OBJDUMP) -d $< > $@
> 
> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
> +$(obj)u-boot-pad.bin:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
>  		$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary  
> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
> -		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >  
> $(obj)u-boot-ubl.bin
> -		$(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
> -		-e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin  
> $(obj)u-boot.ubl
> -		rm $(obj)u-boot-ubl.bin
> +		cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >  
> $(obj)u-boot-pad.bin
>  		rm $(obj)spl/u-boot-spl-pad.bin

This rule lists u-boot-spl.bin as a prerequisite, but it doesn't appear  
to use it -- it uses u-boot-spl instead.

It seems that either spl/Makefile should produce u-boot-spl rather than  
u-boot-spl.bin and let the toplevel Makefile deal with converting it to  
a binary, or spl/Makefile should take care of adding any needed padding  
for the target and the final rule should just be a concatenation.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/19/12 15:39, Scott Wood wrote:
> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>> Samsung's S3C24XX SoCs need this in order to generate a binary
>> image with a padded SPL concatenated with U-Boot.
>> 
>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt> 
>> --- Changes for v2: - None
>> 
>> Changes for v3: - Changed new binary target name from
>> u-boot-ubl.bin to u-boot-pad.bin
>> 
>> Changes for v4: - None --- Makefile |   11 ++++++----- 1 file
>> changed, 6 insertions(+), 5 deletions(-)
>> 
>> diff --git a/Makefile b/Makefile index 8738d55..86dedca 100644 
>> --- a/Makefile +++ b/Makefile @@ -433,14 +433,15 @@
>> $(obj)u-boot.sha1:    $(obj)u-boot.bin $(obj)u-boot.dis:
>> $(obj)u-boot $(OBJDUMP) -d $< > $@
>> 
>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin:
>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) ${OBJCFLAGS}
>> --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl
>> $(obj)spl/u-boot-spl-pad.bin -        cat
>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
>> $(UBL_CONFIG) -T ublimage \ -        -e $(CONFIG_SYS_TEXT_BASE)
>> -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl -        rm
>> $(obj)u-boot-ubl.bin +        cat $(obj)spl/u-boot-spl-pad.bin
>> $(obj)u-boot.bin > $(obj)u-boot-pad.bin rm
>> $(obj)spl/u-boot-spl-pad.bin
> 
> This rule lists u-boot-spl.bin as a prerequisite, but it doesn't
> appear to use it -- it uses u-boot-spl instead.
> 
> It seems that either spl/Makefile should produce u-boot-spl rather
> than u-boot-spl.bin and let the toplevel Makefile deal with
> converting it to a binary, or spl/Makefile should take care of
> adding any needed padding for the target and the final rule should
> just be a concatenation.

So, if we use a weak PAD_TO value of say 0x1, we could always "pad"
u-boot-spl.bin out and then do the concatenation here and in a few
other targets as well.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQWlXRAAoJENk4IS6UOR1W2jQP/2LNJnDDVVIuGHuUul5qfTen
6/BJJAp9BGJAtaLjOU/Yl9PxcKoqm7JgrONxBtOeLx3R3otn/drVjgQWgfizSBw6
niXLcisSa8RzTmC2fufyIQLq4Eq4aIJzJs8SV5jT8+cCKiGdwnl4MLv296JEWSOE
rZUJwCEOsO7hPI7nYnbDkgz2UHSVF8ONhWAAghvOdBC0L9MYWMnbpwC8iFFDPFWf
8ilCFJ9bpMRo9PbLm2ukA4wBXf24L/+GWUn6jr7hOHbsfpvqiTV/59TayliqJHSq
aa06KsRq/D8l9kYy7IBb1bJzWb50LW8FiaHcSrAyctf65fDc/wlL6eUnUCIeOfL1
Fs7rfYYfKSe2aGug9KysfPd6m+nEhVe4dL7DtA5Iq2M+vEZ1h4rEOHTNINn2OaW8
jqBjfi/gn/M6QD3EHCHC0Qr2pOUX1BLJEEj4fd/VkKCE3iHiAmt/9g6qiTUdXdWv
5YOXzG8wG/5LlQvPpfNemsapjo+VrppefPIDvtIjFb8bnfOPHB+EKnAJb+JPFoEq
N5Qru35BP5DXggYDzfITDza0qF47CKSR2uGxNT56hS/vsWcirJEa1E0ZPNUg8CaH
YwbhpsXgRn4J3req2rBrCtn9hwtfBfUd0cTeFdY28YAlgv0QKyUNvcL85iCtE9nK
v6i+//5q/nN/Q22hrR9g
=ul+t
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/19/2012 06:31:29 PM, Tom Rini wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 09/19/12 15:39, Scott Wood wrote:
> > On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> >> Samsung's S3C24XX SoCs need this in order to generate a binary
> >> image with a padded SPL concatenated with U-Boot.
> >>
> >> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
> >> --- Changes for v2: - None
> >>
> >> Changes for v3: - Changed new binary target name from
> >> u-boot-ubl.bin to u-boot-pad.bin
> >>
> >> Changes for v4: - None --- Makefile |   11 ++++++----- 1 file
> >> changed, 6 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/Makefile b/Makefile index 8738d55..86dedca 100644
> >> --- a/Makefile +++ b/Makefile @@ -433,14 +433,15 @@
> >> $(obj)u-boot.sha1:    $(obj)u-boot.bin $(obj)u-boot.dis:
> >> $(obj)u-boot $(OBJDUMP) -d $< > $@
> >>
> >> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
> >> $(obj)u-boot.bin +$(obj)u-boot-pad.bin:
> >> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) ${OBJCFLAGS}
> >> --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl
> >> $(obj)spl/u-boot-spl-pad.bin -        cat
> >> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >
> >> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
> >> $(UBL_CONFIG) -T ublimage \ -        -e $(CONFIG_SYS_TEXT_BASE)
> >> -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl -        rm
> >> $(obj)u-boot-ubl.bin +        cat $(obj)spl/u-boot-spl-pad.bin
> >> $(obj)u-boot.bin > $(obj)u-boot-pad.bin rm
> >> $(obj)spl/u-boot-spl-pad.bin
> >
> > This rule lists u-boot-spl.bin as a prerequisite, but it doesn't
> > appear to use it -- it uses u-boot-spl instead.
> >
> > It seems that either spl/Makefile should produce u-boot-spl rather
> > than u-boot-spl.bin and let the toplevel Makefile deal with
> > converting it to a binary, or spl/Makefile should take care of
> > adding any needed padding for the target and the final rule should
> > just be a concatenation.
> 
> So, if we use a weak PAD_TO value of say 0x1, we could always "pad"
> u-boot-spl.bin out and then do the concatenation here and in a few
> other targets as well.

Yes, or use a variable that includes the linker option, so that it  
expands to an empty string if padding isn't required.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/19/12 16:36, Scott Wood wrote:
> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> On 09/19/12 15:39, Scott Wood wrote:
>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>>> Samsung's S3C24XX SoCs need this in order to generate a 
>>>> binary image with a padded SPL concatenated with U-Boot.
>>>> 
>>>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
>>>> --- Changes for v2: - None
>>>> 
>>>> Changes for v3: - Changed new binary target name from 
>>>> u-boot-ubl.bin to u-boot-pad.bin
>>>> 
>>>> Changes for v4: - None --- Makefile |   11 ++++++----- 1 file
>>>> changed, 6 insertions(+), 5 deletions(-)
>>>> 
>>>> diff --git a/Makefile b/Makefile index 8738d55..86dedca 
>>>> 100644 --- a/Makefile +++ b/Makefile @@ -433,14 +433,15 @@ 
>>>> $(obj)u-boot.sha1:    $(obj)u-boot.bin $(obj)u-boot.dis: 
>>>> $(obj)u-boot $(OBJDUMP) -d $< > $@
>>>> 
>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin 
>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin: 
>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) 
>>>> ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary 
>>>> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin - cat
>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n 
>>>> $(UBL_CONFIG) -T ublimage \ -        -e 
>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin 
>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin + cat
>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
>>> 
>>> This rule lists u-boot-spl.bin as a prerequisite, but it 
>>> doesn't appear to use it -- it uses u-boot-spl instead.
>>> 
>>> It seems that either spl/Makefile should produce u-boot-spl 
>>> rather than u-boot-spl.bin and let the toplevel Makefile deal 
>>> with converting it to a binary, or spl/Makefile should take 
>>> care of adding any needed padding for the target and the final 
>>> rule should just be a concatenation.
>> 
>> So, if we use a weak PAD_TO value of say 0x1, we could always 
>> "pad" u-boot-spl.bin out and then do the concatenation here and 
>> in a few other targets as well.
> 
> Yes, or use a variable that includes the linker option, so that it
>  expands to an empty string if padding isn't required.

Yes, I don't know if say IMAGE_PAD ?= "" and having boards set that to
- --pad-to=... or just saying --pad-to=$(PAD_SIZE) and PAD_SIZE ?= 0x1
ends up looking cleaner once all is said and done.  First one to try
both and patch... :)

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQWlfyAAoJENk4IS6UOR1W4X0P/04JTA9358iiOXrJKUxeZAR0
pVJCzmdiQrlD2Xo7SlApe0s2ZvZL4UvTivmYPlFDcLhpI+ZSkfxHdvXLKNmg//h6
L2ghpAsRtUwZTYgxY1WMvJUuVeh/Pzy8dmJhf5AHwnQ2jAw+SMo3X9jc4e7srCEw
6eSbk/UwG/5WMpLTbUDEp2t9vmSpTkREhv9QvFVeKAzBrSF0fv/OohFIKEx/uuws
HxgXkkzWLox8sp1rCclrNMEFL/EInqa3OSlkF0e2N3514ETHdqBL52qhPWASEz5G
gCHDruxcGTacr1a2ssxURLm5org6ZxlEzywDTluNTnt0VPTOAqCoSLiKL87RQeYB
PrQRWli3r888P+ZG1aOr5OwTxBrgYiynzOGUTkw7FQkf7vF3ak1E2Hvm/7GQCouG
Fm/9aZRDovSk09rbBP7k8M0efV7D5J7PDzRZ6oruIQR6EJu2x64ILyir9HATAUMd
GSjgCDV0BmXYgUJ5I+bLAC/pY9i+aito4lc0Faa1R839tyvP3rvhpFwmAxgOY+97
iFSvpadj0qju/dOouzM250YzLC8a97rvpHQArW4mWw7XPnOh0wSNsfuP/KSrKUUi
YA6gB3DBjUuvT9qTwfwrd/zcYYvZ77nSzlPMcfGOvkpphK+yamv/qogNp7p0Kw43
PtAX09fpq65iVat0ZXtX
=DPv4
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

Tom & Scott,

On 09/20/2012 12:40 AM, Tom Rini wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 09/19/12 16:36, Scott Wood wrote:
>> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>>
>>> On 09/19/12 15:39, Scott Wood wrote:
>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>>>> Samsung's S3C24XX SoCs need this in order to generate a
>>>>> binary image with a padded SPL concatenated with U-Boot.
>>>>>
>>>>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
>>>>> --- Changes for v2: - None
>>>>>
>>>>> Changes for v3: - Changed new binary target name from
>>>>> u-boot-ubl.bin to u-boot-pad.bin
>>>>>
>>>>> Changes for v4: - None --- Makefile |   11 ++++++----- 1 file
>>>>> changed, 6 insertions(+), 5 deletions(-)
>>>>>
>>>>> diff --git a/Makefile b/Makefile index 8738d55..86dedca
>>>>> 100644 --- a/Makefile +++ b/Makefile @@ -433,14 +433,15 @@
>>>>> $(obj)u-boot.sha1:    $(obj)u-boot.bin $(obj)u-boot.dis:
>>>>> $(obj)u-boot $(OBJDUMP) -d $< > $@
>>>>>
>>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
>>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin:
>>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY)
>>>>> ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary
>>>>> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin - cat
>>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >
>>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
>>>>> $(UBL_CONFIG) -T ublimage \ -        -e
>>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin
>>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin + cat
>>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >
>>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
>>>> This rule lists u-boot-spl.bin as a prerequisite, but it
>>>> doesn't appear to use it -- it uses u-boot-spl instead.
>>>>
>>>> It seems that either spl/Makefile should produce u-boot-spl
>>>> rather than u-boot-spl.bin and let the toplevel Makefile deal
>>>> with converting it to a binary, or spl/Makefile should take
>>>> care of adding any needed padding for the target and the final
>>>> rule should just be a concatenation.
>>> So, if we use a weak PAD_TO value of say 0x1, we could always
>>> "pad" u-boot-spl.bin out and then do the concatenation here and
>>> in a few other targets as well.
>> Yes, or use a variable that includes the linker option, so that it
>>   expands to an empty string if padding isn't required.
> Yes, I don't know if say IMAGE_PAD ?= "" and having boards set that to
> - --pad-to=... or just saying --pad-to=$(PAD_SIZE) and PAD_SIZE ?= 0x1
> ends up looking cleaner once all is said and done.  First one to try
> both and patch... :)
>

Please check the following patch. It seems to work for me...

diff --git a/Makefile b/Makefile
index 8738d55..fad8b33 100644
--- a/Makefile
+++ b/Makefile
@@ -433,13 +433,12 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin
  $(obj)u-boot.dis:    $(obj)u-boot
          $(OBJDUMP) -d $< > $@

-$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
-        $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary 
$(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
-        cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
$(obj)u-boot-ubl.bin
+$(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
+        cat $^ > $@
+
+$(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin
          $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
-        -e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl
-        rm $(obj)u-boot-ubl.bin
-        rm $(obj)spl/u-boot-spl-pad.bin
+        -e $(CONFIG_SYS_TEXT_BASE) -d $< $@

  $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
          $(obj)tools/mkimage -s -n /dev/null -T aisimage \
diff --git a/spl/Makefile b/spl/Makefile
index f96c08e..6ea9f26 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -23,6 +23,8 @@ include $(TOPDIR)/config.mk
  # We want the final binaries in this directory
  obj := $(OBJTREE)/spl/

+PAD_TO ?= 1
+
  HAVE_VENDOR_COMMON_LIB := $(shell [ -f 
$(SRCTREE)/board/$(VENDOR)/common/Makefile ] \
              && echo y || echo n)

@@ -124,7 +126,7 @@ $(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin
  endif

  $(obj)u-boot-spl.bin:    $(obj)u-boot-spl
-    $(OBJCOPY) $(OBJCFLAGS) -O binary $< $@
+    $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@

  GEN_UBOOT = \
      UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/19/12 17:38, Jos? Miguel Gon?alves wrote:
> Tom & Scott,
> 
> On 09/20/2012 12:40 AM, Tom Rini wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> On 09/19/12 16:36, Scott Wood wrote:
>>> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
>>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>>> 
>>>> On 09/19/12 15:39, Scott Wood wrote:
>>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
>>>>>> Samsung's S3C24XX SoCs need this in order to generate a 
>>>>>> binary image with a padded SPL concatenated with U-Boot.
>>>>>> 
>>>>>> Signed-off-by: Jos? Miguel Gon?alves
>>>>>> <jose.goncalves@inov.pt> --- Changes for v2: - None
>>>>>> 
>>>>>> Changes for v3: - Changed new binary target name from 
>>>>>> u-boot-ubl.bin to u-boot-pad.bin
>>>>>> 
>>>>>> Changes for v4: - None --- Makefile |   11 ++++++----- 1
>>>>>> file changed, 6 insertions(+), 5 deletions(-)
>>>>>> 
>>>>>> diff --git a/Makefile b/Makefile index 8738d55..86dedca 
>>>>>> 100644 --- a/Makefile +++ b/Makefile @@ -433,14 +433,15
>>>>>> @@ $(obj)u-boot.sha1:    $(obj)u-boot.bin
>>>>>> $(obj)u-boot.dis: $(obj)u-boot $(OBJDUMP) -d $< > $@
>>>>>> 
>>>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin 
>>>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin: 
>>>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) 
>>>>>> ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary 
>>>>>> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin - cat 
>>>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n 
>>>>>> $(UBL_CONFIG) -T ublimage \ -        -e 
>>>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin 
>>>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin + cat 
>>>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
>>>>> This rule lists u-boot-spl.bin as a prerequisite, but it 
>>>>> doesn't appear to use it -- it uses u-boot-spl instead.
>>>>> 
>>>>> It seems that either spl/Makefile should produce
>>>>> u-boot-spl rather than u-boot-spl.bin and let the toplevel
>>>>> Makefile deal with converting it to a binary, or
>>>>> spl/Makefile should take care of adding any needed padding
>>>>> for the target and the final rule should just be a
>>>>> concatenation.
>>>> So, if we use a weak PAD_TO value of say 0x1, we could
>>>> always "pad" u-boot-spl.bin out and then do the concatenation
>>>> here and in a few other targets as well.
>>> Yes, or use a variable that includes the linker option, so that
>>> it expands to an empty string if padding isn't required.
>> Yes, I don't know if say IMAGE_PAD ?= "" and having boards set
>> that to - --pad-to=... or just saying --pad-to=$(PAD_SIZE) and
>> PAD_SIZE ?= 0x1 ends up looking cleaner once all is said and
>> done.  First one to try both and patch... :)
>> 
> 
> Please check the following patch. It seems to work for me...
> 
> diff --git a/Makefile b/Makefile index 8738d55..fad8b33 100644 ---
> a/Makefile +++ b/Makefile @@ -433,13 +433,12 @@ $(obj)u-boot.sha1:
> $(obj)u-boot.bin $(obj)u-boot.dis:    $(obj)u-boot $(OBJDUMP) -d $<
> > $@
> 
> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin 
> -        $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary 
> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin -        cat
> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
> $(obj)u-boot-ubl.bin +$(obj)u-boot-with-spl.bin:
> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin +        cat $^ > $@ + 
> +$(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin 
> $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \ -        -e
> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl -
> rm $(obj)u-boot-ubl.bin -        rm $(obj)spl/u-boot-spl-pad.bin +
> -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
> 
> $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.img 
> $(obj)tools/mkimage -s -n /dev/null -T aisimage \ diff --git
> a/spl/Makefile b/spl/Makefile index f96c08e..6ea9f26 100644 ---
> a/spl/Makefile +++ b/spl/Makefile @@ -23,6 +23,8 @@ include
> $(TOPDIR)/config.mk # We want the final binaries in this directory 
> obj := $(OBJTREE)/spl/
> 
> +PAD_TO ?= 1 + HAVE_VENDOR_COMMON_LIB := $(shell [ -f 
> $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ && echo y || echo
> n)
> 
> @@ -124,7 +126,7 @@ $(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin 
> endif
> 
> $(obj)u-boot-spl.bin:    $(obj)u-boot-spl -    $(OBJCOPY)
> $(OBJCFLAGS) -O binary $< $@ +    $(OBJCOPY) ${OBJCFLAGS}
> --pad-to=$(PAD_TO) -O binary $< $@
> 
> GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \

Tom W, since I'd like you to upgrade the tegra rules after this change
goes in (since they do a u-boot-spl.bin + pad + u-boot.bin + stuff),
does this look good to you as well?  Thanks!

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQWnFxAAoJENk4IS6UOR1WybcQALKP61eZDe4AZCuhacsvFIiX
EWpA4YLSDTA6Z419lkgN7qJoIKbm0lqOvlp8jyWGMgmkUjY/omGEbDjJdqRx3Fmy
Hd937BU9VvUBB11S6qC/FcEpP6vC+yiSCHq9GgQ27q1qxFfnn2uzo5xODdV6XaiW
mBZ4hzbLOJFxM3BVNlBAH2T/4OhVuRRucGYt68Su3EOgcbe3qd0YCHyTLuZl/k8Z
HIDaKku5lgHa2BZT1JjDkRai/QuJhX53EBONc1n/S+fQr1IjXcvcppu8h4x65W8Q
Rb8FKjDbUTuAvksCC/uqPJ59oMhctcmws2ywnRnGo5y097GKyl1zxyuqY5CZMSnu
voJrzuIQpdPp48cXQuMHQx9z5kPmM+ohsDT9/s80AjXdS/2XqwQQjelWosn1krUi
cgEq2IrtTqpiBqrYrEf1nidVJluf1VBKtCV4XRHYd6sSEteimrMu+qfLN/42U+CF
tiFWqjMVpW2SCHUFogYUzARaQ/NXCYvDF1FFvnBmUWd/C9haiHqBUPba3HO/rlmb
dsFM2RcMNX2CKeikA/Tdb4gwCB9wYsjJNQynE3h8BShaCbA04gYT6K1SRXSDiOuO
LQuqrkLsNiL/DrqH3Trvxaxxsy0yGrs9jANfcyPlNbV+A4DKsJK6RX4MP8oYLKoV
OzeS14a1CjZci5FyGgB/
=4cKu
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Warren]

> -----Original Message-----
> From: Tom Rini [mailto:trini at ti.com]
> Sent: Wednesday, September 19, 2012 6:29 PM
> To: Jos? Miguel Gon?alves
> Cc: Scott Wood; u-boot at lists.denx.de; marex at denx.de; mk7.kang at samsung.com;
> Tom Warren
> Subject: Re: [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile
> 
> * PGP Signed by an unknown key
> 
> On 09/19/12 17:38, Jos? Miguel Gon?alves wrote:
> > Tom & Scott,
> >
> > On 09/20/2012 12:40 AM, Tom Rini wrote:
> >> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
> >>
> >> On 09/19/12 16:36, Scott Wood wrote:
> >>> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
> >>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
> >>>>
> >>>> On 09/19/12 15:39, Scott Wood wrote:
> >>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves wrote:
> >>>>>> Samsung's S3C24XX SoCs need this in order to generate a binary
> >>>>>> image with a padded SPL concatenated with U-Boot.
> >>>>>>
> >>>>>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt> ---
> >>>>>> Changes for v2: - None
> >>>>>>
> >>>>>> Changes for v3: - Changed new binary target name from
> >>>>>> u-boot-ubl.bin to u-boot-pad.bin
> >>>>>>
> >>>>>> Changes for v4: - None --- Makefile |   11 ++++++----- 1
> >>>>>> file changed, 6 insertions(+), 5 deletions(-)
> >>>>>>
> >>>>>> diff --git a/Makefile b/Makefile index 8738d55..86dedca
> >>>>>> 100644 --- a/Makefile +++ b/Makefile @@ -433,14 +433,15
> >>>>>> @@ $(obj)u-boot.sha1:    $(obj)u-boot.bin
> >>>>>> $(obj)u-boot.dis: $(obj)u-boot $(OBJDUMP) -d $< > $@
> >>>>>>
> >>>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
> >>>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin:
> >>>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) ${OBJCFLAGS}
> >>>>>> --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl
> >>>>>> $(obj)spl/u-boot-spl-pad.bin - cat $(obj)spl/u-boot-spl-pad.bin
> >>>>>> $(obj)u-boot.bin >
> >>>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
> >>>>>> $(UBL_CONFIG) -T ublimage \ -        -e
> >>>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin
> >>>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin + cat
> >>>>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >
> >>>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
> >>>>> This rule lists u-boot-spl.bin as a prerequisite, but it doesn't
> >>>>> appear to use it -- it uses u-boot-spl instead.
> >>>>>
> >>>>> It seems that either spl/Makefile should produce u-boot-spl rather
> >>>>> than u-boot-spl.bin and let the toplevel Makefile deal with
> >>>>> converting it to a binary, or spl/Makefile should take care of
> >>>>> adding any needed padding for the target and the final rule should
> >>>>> just be a concatenation.
> >>>> So, if we use a weak PAD_TO value of say 0x1, we could always "pad"
> >>>> u-boot-spl.bin out and then do the concatenation here and in a few
> >>>> other targets as well.
> >>> Yes, or use a variable that includes the linker option, so that it
> >>> expands to an empty string if padding isn't required.
> >> Yes, I don't know if say IMAGE_PAD ?= "" and having boards set that
> >> to - --pad-to=... or just saying --pad-to=$(PAD_SIZE) and PAD_SIZE ?=
> >> 0x1 ends up looking cleaner once all is said and done.  First one to
> >> try both and patch... :)
> >>
> >
> > Please check the following patch. It seems to work for me...
> >
> > diff --git a/Makefile b/Makefile index 8738d55..fad8b33 100644 ---
> > a/Makefile +++ b/Makefile @@ -433,13 +433,12 @@ $(obj)u-boot.sha1:
> > $(obj)u-boot.bin $(obj)u-boot.dis:    $(obj)u-boot $(OBJDUMP) -d $<
> > > $@
> >
> > -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
> > -        $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary
> > $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin -        cat
> > $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin
> > +$(obj)u-boot-with-spl.bin:
> > $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin +        cat $^ > $@ +
> > +$(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin
> > $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \ -        -e
> > $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin $(obj)u-boot.ubl -
> > rm $(obj)u-boot-ubl.bin -        rm $(obj)spl/u-boot-spl-pad.bin +
> > -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
> >
> > $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
> > $(obj)tools/mkimage -s -n /dev/null -T aisimage \ diff --git
> > a/spl/Makefile b/spl/Makefile index f96c08e..6ea9f26 100644 ---
> > a/spl/Makefile +++ b/spl/Makefile @@ -23,6 +23,8 @@ include
> > $(TOPDIR)/config.mk # We want the final binaries in this directory obj
> > := $(OBJTREE)/spl/
> >
> > +PAD_TO ?= 1 + HAVE_VENDOR_COMMON_LIB := $(shell [ -f
> > $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ && echo y || echo
> > n)
> >
> > @@ -124,7 +126,7 @@ $(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin endif
> >
> > $(obj)u-boot-spl.bin:    $(obj)u-boot-spl -    $(OBJCOPY)
> > $(OBJCFLAGS) -O binary $< $@ +    $(OBJCOPY) ${OBJCFLAGS}
> > --pad-to=$(PAD_TO) -O binary $< $@
> >
> > GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \
> 
> Tom W, since I'd like you to upgrade the tegra rules after this change goes
> in (since they do a u-boot-spl.bin + pad + u-boot.bin + stuff), does this
> look good to you as well?  Thanks!

I'm not clear what you want the final binary names to be. I seem to be missing segments of this discussion - maybe not CC'd on all threads?

With Tegra, if you flash u-boot.bin, you'll get a DT-less, non-functional binary that will print a 'DT missing!' message and reset ad infinitum. Most folks won't see or care about u-boot-spl.bin, since it's hidden in the spl/ subdir. I don't see the use of having a 'u-boot-with-spl.bin' - doesn't u-boot-spl.bin say the same thing?

If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume is u-boot.bin+dtb - I'm not sure why it's left around - Allen could comment here.

So in my eyes, all you really need is u-boot-dtb-tegra.bin - an unwieldy name, to be sure, but it seems to satisfy your request for a Soc identifier in the name. I voted for just having u-boot.bin be the final product, since that's what most devs look for after a build, but didn't win that battle.  I will probably never use the intermediate binaries, as I'm not likely to paste different DTBs onto base u-boot binaries, etc., or if I did, I'd expect that'd be done in a Makefile, or the user that requires a different DTB appended outside of the normal one could hack the Makefile themselves.

Not to be too difficult, but could you take the Tegra binary section of Makefile and tell me exactly what it is you and/or Jose are proposing the change(s) be?

Thanks,

Tom
> 
> --
> Tom
> 
> * Unknown Key
> * 0x94391D56(L)
-- 
nvpublic

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/20/12 09:01, Tom Warren wrote:
>> -----Original Message----- From: Tom Rini [mailto:trini at ti.com] 
>> Sent: Wednesday, September 19, 2012 6:29 PM To: Jos? Miguel 
>> Gon?alves Cc: Scott Wood; u-boot at lists.denx.de; marex at denx.de; 
>> mk7.kang at samsung.com; Tom Warren Subject: Re: [PATCH v4 10/11] 
>> Add u-boot-pad.bin target to the Makefile
>> 
>> * PGP Signed by an unknown key
>> 
>> On 09/19/12 17:38, Jos? Miguel Gon?alves wrote:
>>> Tom & Scott,
>>> 
>>> On 09/20/2012 12:40 AM, Tom Rini wrote:
>>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>>> 
>>>> On 09/19/12 16:36, Scott Wood wrote:
>>>>> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
>>>>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>>>>> 
>>>>>> On 09/19/12 15:39, Scott Wood wrote:
>>>>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves 
>>>>>>> wrote:
>>>>>>>> Samsung's S3C24XX SoCs need this in order to
>>>>>>>> generate a binary image with a padded SPL
>>>>>>>> concatenated with U-Boot.
>>>>>>>> 
>>>>>>>> Signed-off-by: Jos? Miguel Gon?alves 
>>>>>>>> <jose.goncalves@inov.pt> --- Changes for v2: - None
>>>>>>>> 
>>>>>>>> Changes for v3: - Changed new binary target name from
>>>>>>>> u-boot-ubl.bin to u-boot-pad.bin
>>>>>>>> 
>>>>>>>> Changes for v4: - None --- Makefile |   11 
>>>>>>>> ++++++----- 1 file changed, 6 insertions(+), 5 
>>>>>>>> deletions(-)
>>>>>>>> 
>>>>>>>> diff --git a/Makefile b/Makefile index 
>>>>>>>> 8738d55..86dedca 100644 --- a/Makefile +++
>>>>>>>> b/Makefile @@ -433,14 +433,15 @@ $(obj)u-boot.sha1: 
>>>>>>>> $(obj)u-boot.bin $(obj)u-boot.dis: $(obj)u-boot 
>>>>>>>> $(OBJDUMP) -d $< > $@
>>>>>>>> 
>>>>>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin 
>>>>>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin: 
>>>>>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) 
>>>>>>>> ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary 
>>>>>>>> $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin - 
>>>>>>>> cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>>>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
>>>>>>>>  $(UBL_CONFIG) -T ublimage \ -        -e 
>>>>>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin 
>>>>>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin + 
>>>>>>>> cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>>>>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
>>>>>>> This rule lists u-boot-spl.bin as a prerequisite, but 
>>>>>>> it doesn't appear to use it -- it uses u-boot-spl 
>>>>>>> instead.
>>>>>>> 
>>>>>>> It seems that either spl/Makefile should produce 
>>>>>>> u-boot-spl rather than u-boot-spl.bin and let the 
>>>>>>> toplevel Makefile deal with converting it to a binary, 
>>>>>>> or spl/Makefile should take care of adding any needed 
>>>>>>> padding for the target and the final rule should just 
>>>>>>> be a concatenation.
>>>>>> So, if we use a weak PAD_TO value of say 0x1, we could 
>>>>>> always "pad" u-boot-spl.bin out and then do the 
>>>>>> concatenation here and in a few other targets as well.
>>>>> Yes, or use a variable that includes the linker option, so 
>>>>> that it expands to an empty string if padding isn't 
>>>>> required.
>>>> Yes, I don't know if say IMAGE_PAD ?= "" and having boards 
>>>> set that to - --pad-to=... or just saying 
>>>> --pad-to=$(PAD_SIZE) and PAD_SIZE ?= 0x1 ends up looking 
>>>> cleaner once all is said and done.  First one to try both
>>>> and patch... :)
>>>> 
>>> 
>>> Please check the following patch. It seems to work for me...
>>> 
>>> diff --git a/Makefile b/Makefile index 8738d55..fad8b33 100644 
>>> --- a/Makefile +++ b/Makefile @@ -433,13 +433,12 @@ 
>>> $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)u-boot.dis: 
>>> $(obj)u-boot $(OBJDUMP) -d $<
>>>> $@
>>> 
>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin 
>>> $(obj)u-boot.bin -        $(OBJCOPY) ${OBJCFLAGS} 
>>> --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl 
>>> $(obj)spl/u-boot-spl-pad.bin -        cat 
>>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > 
>>> $(obj)u-boot-ubl.bin +$(obj)u-boot-with-spl.bin: 
>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin +        cat $^ > $@ 
>>> + +$(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin 
>>> $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \ -        -e
>>>  $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin 
>>> $(obj)u-boot.ubl - rm $(obj)u-boot-ubl.bin -        rm 
>>> $(obj)spl/u-boot-spl-pad.bin + -e $(CONFIG_SYS_TEXT_BASE) -d
>>> $< $@
>>> 
>>> $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin 
>>> $(obj)u-boot.img $(obj)tools/mkimage -s -n /dev/null -T 
>>> aisimage \ diff --git a/spl/Makefile b/spl/Makefile index 
>>> f96c08e..6ea9f26 100644 --- a/spl/Makefile +++ b/spl/Makefile 
>>> @@ -23,6 +23,8 @@ include $(TOPDIR)/config.mk # We want the 
>>> final binaries in this directory obj := $(OBJTREE)/spl/
>>> 
>>> +PAD_TO ?= 1 + HAVE_VENDOR_COMMON_LIB := $(shell [ -f 
>>> $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ && echo y || 
>>> echo n)
>>> 
>>> @@ -124,7 +126,7 @@ $(obj)$(BOARD)-spl.bin: 
>>> $(obj)u-boot-spl.bin endif
>>> 
>>> $(obj)u-boot-spl.bin:    $(obj)u-boot-spl -    $(OBJCOPY) 
>>> $(OBJCFLAGS) -O binary $< $@ +    $(OBJCOPY) ${OBJCFLAGS} 
>>> --pad-to=$(PAD_TO) -O binary $< $@
>>> 
>>> GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \
>> 
>> Tom W, since I'd like you to upgrade the tegra rules after this 
>> change goes in (since they do a u-boot-spl.bin + pad +
>> u-boot.bin + stuff), does this look good to you as well?
>> Thanks!
> 
> I'm not clear what you want the final binary names to be. I seem
> to be missing segments of this discussion - maybe not CC'd on all 
> threads?

Sorry, I'm just asking if this way of padding u-boot-spl.bin to the
required size by default in spl/Makefile and then not doing any
- --pad-to in the toplevel Makefile rules for u-boot-spl will work for
your needs as well (so update the existing rules to just concatenate
spl/u-boot-spl.bin and u-boot.bin and whatever else you need and have
PAD_TO be set to $(CONFIG_SYS_TEXT_BASE), I believe).

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQW0LyAAoJENk4IS6UOR1Wst8P/2IhNv0s3YKGp2r8ze4TWKaJ
rMxHs9KQ+ZHcemZuD4jWkx+Ms1pZrZlKDbF2lG622n+FsgTvXP8xSyBZCB0sV0J9
wVUQR8QB6EHrdw5pOhMn7T4y3+sy61l/E50NQHU5Nu2sA7t5g/xQH95gslN9b1yv
VNhX/sdISna8lEqJPF5Iuxuc9Cl7huEbSCpu/uETQZVqHfKDxkp7mZDcOHq0JJ4q
150WwOQhNKNgtX1AV9D2vcDHMRO6AOXE1cH/jMv9CBoPMkeJaW1EaGHTv8PrKeUG
ONN8fCEcdTEPvv6XXk3DLXVDFruAG7jk7bQr7B59nr5NVwuxZkZKOGn4o07stTBK
c2ixDbsS8K4BIlDrAMckd4pyjAWVE0bN8lDfOKvJtxMDSjMj+EagiDnPkAsnzJAB
Usml6rpIuBNLC2l4MZsYEihNHk0I10/M328c0kKUwWmT4UI3GB8V/sti1OUOyAoy
DBy9dH7U/aPVr72aXLcBf8vDdA3abHmHt6zLq4KDMw4+xBLmsqmALYvOOoGSdW9S
X5C6d6xpQVt5ovvSV8IZkT3rKUFAhmjcLgjwxKam3eTuSEyapZAJPji9h1Bl2PMB
UqR6MP8RceP9OqkSXhyCK6reFq6KCtsvGMdPnYs2uY2dZVjqMwtxPNWE1W39LqhU
VCbg1HKz/kmpmS9gQqRt
=qd5a
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Warren]

Tom,

> -----Original Message-----
> From: Tom Rini [mailto:trini at ti.com]
> Sent: Thursday, September 20, 2012 9:23 AM
> To: Tom Warren
> Cc: Jos? Miguel Gon?alves; Scott Wood; u-boot at lists.denx.de; marex at denx.de;
> mk7.kang at samsung.com
> Subject: Re: [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile
> 
> * PGP Signed by an unknown key
> 
> On 09/20/12 09:01, Tom Warren wrote:
> >> -----Original Message----- From: Tom Rini [mailto:trini at ti.com]
> >> Sent: Wednesday, September 19, 2012 6:29 PM To: Jos? Miguel Gon?alves
> >> Cc: Scott Wood; u-boot at lists.denx.de; marex at denx.de;
> >> mk7.kang at samsung.com; Tom Warren Subject: Re: [PATCH v4 10/11] Add
> >> u-boot-pad.bin target to the Makefile
> >>
> >> > Old Signed by an unknown key
> >>
> >> On 09/19/12 17:38, Jos? Miguel Gon?alves wrote:
> >>> Tom & Scott,
> >>>
> >>> On 09/20/2012 12:40 AM, Tom Rini wrote:
> >>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
> >>>>
> >>>> On 09/19/12 16:36, Scott Wood wrote:
> >>>>> On 09/19/2012 06:31:29 PM, Tom Rini wrote:
> >>>>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
> >>>>>>
> >>>>>> On 09/19/12 15:39, Scott Wood wrote:
> >>>>>>> On 09/19/2012 06:25:26 AM, Jos? Miguel Gon?alves
> >>>>>>> wrote:
> >>>>>>>> Samsung's S3C24XX SoCs need this in order to generate a binary
> >>>>>>>> image with a padded SPL concatenated with U-Boot.
> >>>>>>>>
> >>>>>>>> Signed-off-by: Jos? Miguel Gon?alves <jose.goncalves@inov.pt>
> >>>>>>>> --- Changes for v2: - None
> >>>>>>>>
> >>>>>>>> Changes for v3: - Changed new binary target name from
> >>>>>>>> u-boot-ubl.bin to u-boot-pad.bin
> >>>>>>>>
> >>>>>>>> Changes for v4: - None --- Makefile |   11
> >>>>>>>> ++++++----- 1 file changed, 6 insertions(+), 5
> >>>>>>>> deletions(-)
> >>>>>>>>
> >>>>>>>> diff --git a/Makefile b/Makefile index 8738d55..86dedca 100644
> >>>>>>>> --- a/Makefile +++ b/Makefile @@ -433,14 +433,15 @@
> >>>>>>>> $(obj)u-boot.sha1:
> >>>>>>>> $(obj)u-boot.bin $(obj)u-boot.dis: $(obj)u-boot
> >>>>>>>> $(OBJDUMP) -d $< > $@
> >>>>>>>>
> >>>>>>>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
> >>>>>>>> $(obj)u-boot.bin +$(obj)u-boot-pad.bin:
> >>>>>>>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY)
> >>>>>>>> ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl
> >>>>>>>> $(obj)spl/u-boot-spl-pad.bin - cat $(obj)spl/u-boot-spl-pad.bin
> >>>>>>>> $(obj)u-boot.bin >
> >>>>>>>> $(obj)u-boot-ubl.bin -        $(obj)tools/mkimage -n
> >>>>>>>>  $(UBL_CONFIG) -T ublimage \ -        -e
> >>>>>>>> $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin
> >>>>>>>> $(obj)u-boot.ubl -        rm $(obj)u-boot-ubl.bin +
> >>>>>>>> cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin >
> >>>>>>>> $(obj)u-boot-pad.bin rm $(obj)spl/u-boot-spl-pad.bin
> >>>>>>> This rule lists u-boot-spl.bin as a prerequisite, but it doesn't
> >>>>>>> appear to use it -- it uses u-boot-spl instead.
> >>>>>>>
> >>>>>>> It seems that either spl/Makefile should produce u-boot-spl
> >>>>>>> rather than u-boot-spl.bin and let the toplevel Makefile deal
> >>>>>>> with converting it to a binary, or spl/Makefile should take care
> >>>>>>> of adding any needed padding for the target and the final rule
> >>>>>>> should just be a concatenation.
> >>>>>> So, if we use a weak PAD_TO value of say 0x1, we could always
> >>>>>> "pad" u-boot-spl.bin out and then do the concatenation here and
> >>>>>> in a few other targets as well.
> >>>>> Yes, or use a variable that includes the linker option, so that it
> >>>>> expands to an empty string if padding isn't required.
> >>>> Yes, I don't know if say IMAGE_PAD ?= "" and having boards set that
> >>>> to - --pad-to=... or just saying
> >>>> --pad-to=$(PAD_SIZE) and PAD_SIZE ?= 0x1 ends up looking cleaner
> >>>> once all is said and done.  First one to try both and patch... :)
> >>>>
> >>>
> >>> Please check the following patch. It seems to work for me...
> >>>
> >>> diff --git a/Makefile b/Makefile index 8738d55..fad8b33 100644
> >>> --- a/Makefile +++ b/Makefile @@ -433,13 +433,12 @@
> >>> $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)u-boot.dis:
> >>> $(obj)u-boot $(OBJDUMP) -d $<
> >>>> $@
> >>>
> >>> -$(obj)u-boot.ubl:       $(obj)spl/u-boot-spl.bin
> >>> $(obj)u-boot.bin -        $(OBJCOPY) ${OBJCFLAGS}
> >>> --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl
> >>> $(obj)spl/u-boot-spl-pad.bin -        cat
> >>> $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-ubl.bin
> >>> +$(obj)u-boot-with-spl.bin:
> >>> $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin +        cat $^ > $@
> >>> + +$(obj)u-boot.ubl:       $(obj)u-boot-with-spl.bin
> >>> $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \ -        -e
> >>>  $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-ubl.bin
> >>> $(obj)u-boot.ubl - rm $(obj)u-boot-ubl.bin -        rm
> >>> $(obj)spl/u-boot-spl-pad.bin + -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
> >>>
> >>> $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin
> >>> $(obj)u-boot.img $(obj)tools/mkimage -s -n /dev/null -T aisimage \
> >>> diff --git a/spl/Makefile b/spl/Makefile index
> >>> f96c08e..6ea9f26 100644 --- a/spl/Makefile +++ b/spl/Makefile @@
> >>> -23,6 +23,8 @@ include $(TOPDIR)/config.mk # We want the final
> >>> binaries in this directory obj := $(OBJTREE)/spl/
> >>>
> >>> +PAD_TO ?= 1 + HAVE_VENDOR_COMMON_LIB := $(shell [ -f
> >>> $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ && echo y || echo n)
> >>>
> >>> @@ -124,7 +126,7 @@ $(obj)$(BOARD)-spl.bin:
> >>> $(obj)u-boot-spl.bin endif
> >>>
> >>> $(obj)u-boot-spl.bin:    $(obj)u-boot-spl -    $(OBJCOPY)
> >>> $(OBJCFLAGS) -O binary $< $@ +    $(OBJCOPY) ${OBJCFLAGS}
> >>> --pad-to=$(PAD_TO) -O binary $< $@
> >>>
> >>> GEN_UBOOT = \ UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) | \
> >>
> >> Tom W, since I'd like you to upgrade the tegra rules after this
> >> change goes in (since they do a u-boot-spl.bin + pad + u-boot.bin +
> >> stuff), does this look good to you as well?
> >> Thanks!
> >
> > I'm not clear what you want the final binary names to be. I seem to be
> > missing segments of this discussion - maybe not CC'd on all threads?
> 
> Sorry, I'm just asking if this way of padding u-boot-spl.bin to the required
> size by default in spl/Makefile and then not doing any --pad-to in the
> toplevel Makefile rules for u-boot-spl will work for your needs as well (so
> update the existing rules to just concatenate spl/u-boot-spl.bin and u-
> boot.bin and whatever else you need and have PAD_TO be set to
> $(CONFIG_SYS_TEXT_BASE), I believe).

That may work, but let's have Allen comment, since he did all the SPL work. If there's a proposed patch, I can take it and test it.

Tom
> 
> --
> Tom
> 
> * Unknown Key
> * 0x94391D56(L)
-- 
nvpublic

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/20/2012 11:01:42 AM, Tom Warren wrote:
> > -----Original Message-----
> > From: Tom Rini [mailto:trini at ti.com]
> > Sent: Wednesday, September 19, 2012 6:29 PM
> > To: Jos? Miguel Gon?alves
> > Cc: Scott Wood; u-boot at lists.denx.de; marex at denx.de;  
> mk7.kang at samsung.com;
> > Tom Warren
> > Subject: Re: [PATCH v4 10/11] Add u-boot-pad.bin target to the  
> Makefile
> >
> > Tom W, since I'd like you to upgrade the tegra rules after this  
> change goes
> > in (since they do a u-boot-spl.bin + pad + u-boot.bin + stuff),  
> does this
> > look good to you as well?  Thanks!
> 
> I'm not clear what you want the final binary names to be. I seem to  
> be missing segments of this discussion - maybe not CC'd on all  
> threads?
> 
> With Tegra, if you flash u-boot.bin, you'll get a DT-less,  
> non-functional binary that will print a 'DT missing!' message and  
> reset ad infinitum. Most folks won't see or care about  
> u-boot-spl.bin, since it's hidden in the spl/ subdir. I don't see the  
> use of having a 'u-boot-with-spl.bin' - doesn't u-boot-spl.bin say  
> the same thing?

u-boot-spl.bin is just the SPL.  u-boot-with-spl.bin is SPL plus u-boot.

Or maybe the former could just become spl.bin, and then u-boot-spl.bin  
could mean the latter?  There's really no reason to put "u-boot" in the  
name of every intermediate file that represents something more specific.

> If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning  
> U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume  
> is u-boot.bin+dtb - I'm not sure why it's left around - Allen could  
> comment here.

It's useful to leave intermediate files around for debugging.

> So in my eyes, all you really need is u-boot-dtb-tegra.bin - an  
> unwieldy name, to be sure, but it seems to satisfy your request for a  
> Soc identifier in the name.

If the only thing Tegra-specific about the output format is that it has  
a dtb bundled, I think it should have a more generic name, as other  
targets could end up using a dtb as well.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

On 20-09-2012 19:09, Scott Wood wrote:
> On 09/20/2012 11:01:42 AM, Tom Warren wrote:
>> > -----Original Message-----
>> > From: Tom Rini [mailto:trini at ti.com]
>> > Sent: Wednesday, September 19, 2012 6:29 PM
>> > To: Jos? Miguel Gon?alves
>> > Cc: Scott Wood; u-boot at lists.denx.de; marex at denx.de; mk7.kang at samsung.com;
>> > Tom Warren
>> > Subject: Re: [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile
>> >
>> > Tom W, since I'd like you to upgrade the tegra rules after this change goes
>> > in (since they do a u-boot-spl.bin + pad + u-boot.bin + stuff), does this
>> > look good to you as well?  Thanks!
>>
>> I'm not clear what you want the final binary names to be. I seem to be missing 
>> segments of this discussion - maybe not CC'd on all threads?
>>
>> With Tegra, if you flash u-boot.bin, you'll get a DT-less, non-functional 
>> binary that will print a 'DT missing!' message and reset ad infinitum. Most 
>> folks won't see or care about u-boot-spl.bin, since it's hidden in the spl/ 
>> subdir. I don't see the use of having a 'u-boot-with-spl.bin' - doesn't 
>> u-boot-spl.bin say the same thing?
>
> u-boot-spl.bin is just the SPL.  u-boot-with-spl.bin is SPL plus u-boot.
>
> Or maybe the former could just become spl.bin, and then u-boot-spl.bin could 
> mean the latter?  There's really no reason to put "u-boot" in the name of every 
> intermediate file that represents something more specific.

So, before I resubmit my patch, can you please tell me what should be the name for 
the file with SPL plus u-boot;

1) u-boot-with-spl.bin
2) u-boot-spl.bin (and rename the SPL only file to 'spl.bin')
3) ???

>
>> If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning U-Boot. 
>> There's an intermediate file (u-boot-dtb.bin) that I assume is u-boot.bin+dtb - 
>> I'm not sure why it's left around - Allen could comment here.
>
> It's useful to leave intermediate files around for debugging.
>
>> So in my eyes, all you really need is u-boot-dtb-tegra.bin - an unwieldy name, 
>> to be sure, but it seems to satisfy your request for a Soc identifier in the name.
>
> If the only thing Tegra-specific about the output format is that it has a dtb 
> bundled, I think it should have a more generic name, as other targets could end 
> up using a dtb as well.
>
>

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Wolfgang Denk]

Dear Tom,

In message <5FBF8E85CA34454794F0F7ECBA79798F379F6FD992@HQMAIL04.nvidia.com> you wrote:
>
> If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning
> U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume
> is u-boot.bin+dtb - I'm not sure why it's left around - Allen could
> comment here.

I _dislike_ the idea of having image names which include architecture
or even board parts.  I would really like to have generic names, that
can be used in a consistent way across platforms, architectures and
boards.

> So in my eyes, all you really need is u-boot-dtb-tegra.bin - an
> unwieldy name, to be sure, but it seems to satisfy your request for a
> Soc identifier in the name. I voted for just having u-boot.bin be the

Please reconsider.  I definitely do NOT want to have SoC names or that
in any such images!


IIRC, the original idea was to provide image names (common for all
architectures, SoCs, boards) that only depend on where you install
U-Boot to.  in this way, we would have:

- u-boot.bin	for the generic case (say, for installation into NOR
                flash, no SPL or similar needed).
- u-boot-nand.bin
		for installation in NAND (with all needed headers,
		padding etc. included)
- u-boot-onenand.bin
		for installation in OneNAND
- u-boot.sd	for installation on a SDCard
		[actually we have an inconsistency in names here; this
		should have been "u-boot-sd.bin" or maybe even better
		"u-boot-sdcard.bin"]
etc.

It is very important to me that we do NOT include any architectures,
SoCs, or board specifc parts in the names because this will cause
major PITA for all kind of automatic test suites etc.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"He was so narrow minded he could see through  a  keyhole  with  both
eyes ..."

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

Hi Wolfgang,

On 09/21/2012 06:43 AM, Wolfgang Denk wrote:
> Dear Tom,
>
> In message <5FBF8E85CA34454794F0F7ECBA79798F379F6FD992@HQMAIL04.nvidia.com> you wrote:
>> If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning
>> U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume
>> is u-boot.bin+dtb - I'm not sure why it's left around - Allen could
>> comment here.
> I _dislike_ the idea of having image names which include architecture
> or even board parts.  I would really like to have generic names, that
> can be used in a consistent way across platforms, architectures and
> boards.
>
>> So in my eyes, all you really need is u-boot-dtb-tegra.bin - an
>> unwieldy name, to be sure, but it seems to satisfy your request for a
>> Soc identifier in the name. I voted for just having u-boot.bin be the
> Please reconsider.  I definitely do NOT want to have SoC names or that
> in any such images!
>
>
> IIRC, the original idea was to provide image names (common for all
> architectures, SoCs, boards) that only depend on where you install
> U-Boot to.  in this way, we would have:
>
> - u-boot.bin	for the generic case (say, for installation into NOR
>                  flash, no SPL or similar needed).
> - u-boot-nand.bin
> 		for installation in NAND (with all needed headers,
> 		padding etc. included)
> - u-boot-onenand.bin
> 		for installation in OneNAND
> - u-boot.sd	for installation on a SDCard
> 		[actually we have an inconsistency in names here; this
> 		should have been "u-boot-sd.bin" or maybe even better
> 		"u-boot-sdcard.bin"]
> etc.
>
> It is very important to me that we do NOT include any architectures,
> SoCs, or board specifc parts in the names because this will cause
> major PITA for all kind of automatic test suites etc.
>

To me this seems also a cleaner solution, as any end user, that simply 
takes the u-boot sources and performs a make, would easily find the 
appropriate file to burn on his boot media.

But in that case, as the NAND image format (for instance) is 
architecture and/or SoC dependant, what do you suggest is to add 
conditionals in the Makefile that adequate the 'u-boot-nand.bin' file to 
the target SoC?

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Wolfgang Denk]

Dear Jos? Miguel Gon?alves,

In message <505C21BB.7000209@inov.pt> you wrote:
>
> > It is very important to me that we do NOT include any architectures,
> > SoCs, or board specifc parts in the names because this will cause
> > major PITA for all kind of automatic test suites etc.
> 
> To me this seems also a cleaner solution, as any end user, that simply 
> takes the u-boot sources and performs a make, would easily find the 
> appropriate file to burn on his boot media.
> 
> But in that case, as the NAND image format (for instance) is 
> architecture and/or SoC dependant, what do you suggest is to add 
> conditionals in the Makefile that adequate the 'u-boot-nand.bin' file to 
> the target SoC?

SoC specific make rules can probably be added to the respective SoC
specific makefiles, thus still avoiding to clutter the top level
Makefile with lots of conditionals.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There comes to all races an ultimate crisis which  you  have  yet  to
face  ....  One  day  our  minds became so powerful we dared think of
ourselves as gods.
	-- Sargon, "Return to Tomorrow", stardate 4768.3

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Marek Vasut]

Dear Wolfgang Denk,

> Dear Jos? Miguel Gon?alves,
> 
> In message <505C21BB.7000209@inov.pt> you wrote:
> > > It is very important to me that we do NOT include any architectures,
> > > SoCs, or board specifc parts in the names because this will cause
> > > major PITA for all kind of automatic test suites etc.
> > 
> > To me this seems also a cleaner solution, as any end user, that simply
> > takes the u-boot sources and performs a make, would easily find the
> > appropriate file to burn on his boot media.
> > 
> > But in that case, as the NAND image format (for instance) is
> > architecture and/or SoC dependant, what do you suggest is to add
> > conditionals in the Makefile that adequate the 'u-boot-nand.bin' file to
> > the target SoC?
> 
> SoC specific make rules can probably be added to the respective SoC
> specific makefiles, thus still avoiding to clutter the top level
> Makefile with lots of conditionals.

I've been pestering Tom about this a lot, but we got nowhere so far. That's the 
problem here :-(

> Best regards,
> 
> Wolfgang Denk

Best regards,
Marek Vasut

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/21/12 08:52, Wolfgang Denk wrote:
> Dear Jos? Miguel Gon?alves,
> 
> In message <505C21BB.7000209@inov.pt> you wrote:
>> 
>>> It is very important to me that we do NOT include any 
>>> architectures, SoCs, or board specifc parts in the names 
>>> because this will cause major PITA for all kind of automatic 
>>> test suites etc.
>> 
>> To me this seems also a cleaner solution, as any end user, that 
>> simply takes the u-boot sources and performs a make, would
>> easily find the appropriate file to burn on his boot media.
>> 
>> But in that case, as the NAND image format (for instance) is 
>> architecture and/or SoC dependant, what do you suggest is to add 
>> conditionals in the Makefile that adequate the 'u-boot-nand.bin' 
>> file to the target SoC?
> 
> SoC specific make rules can probably be added to the respective SoC
> specific makefiles, thus still avoiding to clutter the top level
> Makefile with lots of conditionals.

Ideally? Yes, Possible today?  Not sure.  I have a hazy recollection
that it wasn't so easy when I tried adding some build rules to one of
the config.mk files.  When I post SPI SPL for am335x support I'll try
again since for that I need to add a rule to generate a byte-swapped
MLO file.  If that can go somewhere other than spl/Makefile that would
be nice (but needs to be visible to a number of TI SoCs is an issue).

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQXJIxAAoJENk4IS6UOR1WvRgP/1sA7S2GQUKx6v67zP/9aful
4YnamVKZkuutSuf/FKadLoK9NQbB4VOq6gXUcwbANlygiFVX9Ax9K6XC0JNYOSpm
DeitwLu/ni9MduYM/11quwwfDWBKvIUO62cJcnRiDVSn3xyjJeEfr6lEHmgpcRx5
0wlVT183OurED18ZXZYRRKe1AxxEixVhk8XHMbBxrV01CbZckhjMgVfOCoVgIbtZ
8jo5NmW1b9TfT2FDPfEAVelpm8XTEKspVubgyE6C2uZosQOtgemMNNyTBhcAINX8
dTAed1aDJ/3ja7HEOCvnS5KtKrGnTIopWh5Q9JumrvpRYa72AXUkz2bBmWl/b4+E
fZJMWoIaMh79gGcjBLU3rquCuY+zYxO9qXnKC8JaT5YnhGmIhHPFYDie1XU+9IQm
EuJSzo8A3jM9TTURjmhIQ7svO6HcliuDU96HmjxKWdN/J7v+erKxy9XDwmn72R0Y
oz8yQu+Sf85HAlmx5uoOZ+B8jinDxfZFseuQyrq4V8wUwTbxrFzHEelWvkSCfAn7
rr9ZjzCiCUymxpACp4YvLTultsiYIzbVevOliMbrO6ymsyByT6YmOO1eqSmsCkqq
2zXP0TZhdNgZVaGsYa+debvk7wjfTLlSqIUqKmOujPmwrtKXhGmxe9Cg4FpBbUuQ
aG3hO/HSgMhBVpdS++60
=TSHS
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[José Miguel Gonçalves]

On 21-09-2012 17:13, Tom Rini wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 09/21/12 08:52, Wolfgang Denk wrote:
>> Dear Jos? Miguel Gon?alves,
>>
>> In message <505C21BB.7000209@inov.pt> you wrote:
>>>> It is very important to me that we do NOT include any
>>>> architectures, SoCs, or board specifc parts in the names
>>>> because this will cause major PITA for all kind of automatic
>>>> test suites etc.
>>> To me this seems also a cleaner solution, as any end user, that
>>> simply takes the u-boot sources and performs a make, would
>>> easily find the appropriate file to burn on his boot media.
>>>
>>> But in that case, as the NAND image format (for instance) is
>>> architecture and/or SoC dependant, what do you suggest is to add
>>> conditionals in the Makefile that adequate the 'u-boot-nand.bin'
>>> file to the target SoC?
>> SoC specific make rules can probably be added to the respective SoC
>> specific makefiles, thus still avoiding to clutter the top level
>> Makefile with lots of conditionals.
> Ideally? Yes, Possible today?  Not sure.  I have a hazy recollection
> that it wasn't so easy when I tried adding some build rules to one of
> the config.mk files.  When I post SPI SPL for am335x support I'll try
> again since for that I need to add a rule to generate a byte-swapped
> MLO file.  If that can go somewhere other than spl/Makefile that would
> be nice (but needs to be visible to a number of TI SoCs is an issue).
>

So what is your suggestion for my patch?
Can I push it with a new "u-boot-with-spl.bin" target and you'll handle the 
unification of all NAND targets later?

Best regards,
Jos? Gon?alves

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Langer Thomas]

Hello Tom,

Tom Rini wrote on?2012-09-21:

>> SoC specific make rules can probably be added to the respective SoC
>> specific makefiles, thus still avoiding to clutter the top level
>> Makefile with lots of conditionals.
> 
> Ideally? Yes, Possible today?  Not sure.  I have a hazy recollection
> that it wasn't so easy when I tried adding some build rules to one of
> the config.mk files.  When I post SPI SPL for am335x support I'll try
> again since for that I need to add a rule to generate a byte-swapped
> MLO file.  If that can go somewhere other than spl/Makefile that would
> be nice (but needs to be visible to a number of TI SoCs is an issue).

I have done something like this in a SoC config.mk:
<---
# only active in topdir
ifeq ($(subst $(SRCTREE),,$(CURDIR)),)

ALL-y += $(obj)u-boot-SoC-file

$(obj)u-boot-SoC-file: ...
	...
endif
--->

Without the check the rule(s) become active in all subdirs.

And of course this is a hack, as it is a Makefile fragment and not only a config anymore.

But maybe this gives you or someone else a hint for implementing a cleaner framework for
SoC specific image rules?

> 
> - --
> Tom

Best regards,
Thomas

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/21/12 09:26, Jos? Miguel Gon?alves wrote:
> On 21-09-2012 17:13, Tom Rini wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> On 09/21/12 08:52, Wolfgang Denk wrote:
>>> Dear Jos? Miguel Gon?alves,
>>> 
>>> In message <505C21BB.7000209@inov.pt> you wrote:
>>>>> It is very important to me that we do NOT include any 
>>>>> architectures, SoCs, or board specifc parts in the names 
>>>>> because this will cause major PITA for all kind of 
>>>>> automatic test suites etc.
>>>> To me this seems also a cleaner solution, as any end user, 
>>>> that simply takes the u-boot sources and performs a make, 
>>>> would easily find the appropriate file to burn on his boot 
>>>> media.
>>>> 
>>>> But in that case, as the NAND image format (for instance) is
>>>>  architecture and/or SoC dependant, what do you suggest is
>>>> to add conditionals in the Makefile that adequate the 
>>>> 'u-boot-nand.bin' file to the target SoC?
>>> SoC specific make rules can probably be added to the
>>> respective SoC specific makefiles, thus still avoiding to
>>> clutter the top level Makefile with lots of conditionals.
>> Ideally? Yes, Possible today?  Not sure.  I have a hazy 
>> recollection that it wasn't so easy when I tried adding some 
>> build rules to one of the config.mk files.  When I post SPI SPL 
>> for am335x support I'll try again since for that I need to add a 
>> rule to generate a byte-swapped MLO file.  If that can go 
>> somewhere other than spl/Makefile that would be nice (but needs 
>> to be visible to a number of TI SoCs is an issue).
>> 
> 
> So what is your suggestion for my patch? Can I push it with a new 
> "u-boot-with-spl.bin" target and you'll handle the unification of 
> all NAND targets later?

Having said I'm terrible at names already, Scott suggested that one
and Wolfgang didn't object, so yes, you add that target and the more
general problem falls to me.  I'll just outsource the naming parts of
it :)

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQXJf5AAoJENk4IS6UOR1W8XwQAJ1KTaHrr2F0w1/qvFZdIIOM
JJz9tWhYTiLRvrWhJfIgx3kwtflxzw6JQuLfwhOryf5/5W43ySRYPb+vHl1PBwq4
RlhwVdRUpPBZPWhuSrgajIi4P8z4OkaaW7v+YhkrNh1QQCbTQMO/RWYa66Xou6UJ
hAsnCKJkTqOjpCxc2JeYL/hK/EUba7o4zYAU1H8sdVtch4hOvAJEMT9C/D6/Vxsq
FyNB0+IMcomYavimjbTPLIVRUCpr2lt/8l5TTIPhjnqXUbSetrgysLn75ofKBU7Q
db/cf+Ry2bFTGnQ8OdPU2FCwsqA905EU/WCjjX6/yUwRR3OpnJVkPi0DTqvEJ0YR
gpADl5yy6VmCcZXRnPa1CGRyKv3vbRk333W4X2FgNCUES98BUM8L/qbbd29Tb5I7
KiaF6s5YoeDVCqMW7ER9a+BvvzD2YlHHcO4PwgOPu+xdkGbWxosxdKOgWRmTjR8X
HQnuzwqT0X36unC5HpLxmzqHHxTomP02dil7eT+XHMNA6d/Jd61ByZvd2Lk/getw
gALsACCcAZN/WtpA1s6DGYBX2/g/8pMul5Hf3tbAFseKumqeqd+ufcAEPgAQ/nKV
8sUz2DtFnmRsaukTkCl3aFexPr1upbQJh/EkopLq3uuHwKRxWymP2AQ/AAML7kYY
94pdwweLvRpb3AYvS5ZJ
=xeXW
-----END PGP SIGNATURE-----

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/21/2012 12:43:48 AM, Wolfgang Denk wrote:
> Dear Tom,
> 
> In message  
> <5FBF8E85CA34454794F0F7ECBA79798F379F6FD992@HQMAIL04.nvidia.com> you  
> wrote:
> >
> > If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning
> > U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume
> > is u-boot.bin+dtb - I'm not sure why it's left around - Allen could
> > comment here.
> 
> I _dislike_ the idea of having image names which include architecture
> or even board parts.  I would really like to have generic names, that
> can be used in a consistent way across platforms, architectures and
> boards.
> 
> > So in my eyes, all you really need is u-boot-dtb-tegra.bin - an
> > unwieldy name, to be sure, but it seems to satisfy your request for  
> a
> > Soc identifier in the name. I voted for just having u-boot.bin be  
> the
> 
> Please reconsider.  I definitely do NOT want to have SoC names or that
> in any such images!
> 
> 
> IIRC, the original idea was to provide image names (common for all
> architectures, SoCs, boards) that only depend on where you install
> U-Boot to.  in this way, we would have:
> 
> - u-boot.bin	for the generic case (say, for installation into NOR
>                 flash, no SPL or similar needed).
> - u-boot-nand.bin
> 		for installation in NAND (with all needed headers,
> 		padding etc. included)
> - u-boot-onenand.bin
> 		for installation in OneNAND
> - u-boot.sd	for installation on a SDCard
> 		[actually we have an inconsistency in names here; this
> 		should have been "u-boot-sd.bin" or maybe even better
> 		"u-boot-sdcard.bin"]
> etc.
> 
> It is very important to me that we do NOT include any architectures,
> SoCs, or board specifc parts in the names because this will cause
> major PITA for all kind of automatic test suites etc.

The awkwardness with naming based on nand/onenand/sd is that we no  
longer have build infrastructure that is specific to the type of boot  
device -- and IIRC with some of the newer SPL targets, the same image  
works on multiple types of boot device.

Having u-boot.bin be the final output regardless of internal  
implementation details such as spl would avoid that problem, and be  
even nicer to automated testing than the nand/onenand/sd names.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Marek Vasut]

Dear Scott Wood,

> On 09/21/2012 12:43:48 AM, Wolfgang Denk wrote:
> > Dear Tom,
> > 
> > In message
> > <5FBF8E85CA34454794F0F7ECBA79798F379F6FD992@HQMAIL04.nvidia.com> you
> > 
> > wrote:
> > > If you flash u-boot-dtb-tegra.bin, you'll get a fully functioning
> > > U-Boot. There's an intermediate file (u-boot-dtb.bin) that I assume
> > > is u-boot.bin+dtb - I'm not sure why it's left around - Allen could
> > > comment here.
> > 
> > I _dislike_ the idea of having image names which include architecture
> > or even board parts.  I would really like to have generic names, that
> > can be used in a consistent way across platforms, architectures and
> > boards.
> > 
> > > So in my eyes, all you really need is u-boot-dtb-tegra.bin - an
> > > unwieldy name, to be sure, but it seems to satisfy your request for
> > 
> > a
> > 
> > > Soc identifier in the name. I voted for just having u-boot.bin be
> > 
> > the
> > 
> > Please reconsider.  I definitely do NOT want to have SoC names or that
> > in any such images!
> > 
> > 
> > IIRC, the original idea was to provide image names (common for all
> > architectures, SoCs, boards) that only depend on where you install
> > U-Boot to.  in this way, we would have:
> > 
> > - u-boot.bin	for the generic case (say, for installation into NOR
> > 
> >                 flash, no SPL or similar needed).
> > 
> > - u-boot-nand.bin
> > 
> > 		for installation in NAND (with all needed headers,
> > 		padding etc. included)
> > 
> > - u-boot-onenand.bin
> > 
> > 		for installation in OneNAND
> > 
> > - u-boot.sd	for installation on a SDCard
> > 
> > 		[actually we have an inconsistency in names here; this
> > 		should have been "u-boot-sd.bin" or maybe even better
> > 		"u-boot-sdcard.bin"]
> > 
> > etc.
> > 
> > It is very important to me that we do NOT include any architectures,
> > SoCs, or board specifc parts in the names because this will cause
> > major PITA for all kind of automatic test suites etc.
> 
> The awkwardness with naming based on nand/onenand/sd is that we no
> longer have build infrastructure that is specific to the type of boot
> device -- and IIRC with some of the newer SPL targets, the same image
> works on multiple types of boot device.
> 
> Having u-boot.bin be the final output regardless of internal
> implementation details such as spl would avoid that problem, and be
> even nicer to automated testing than the nand/onenand/sd names.

On the other hand, I use u-boot.bin and expect it to always be the raw linked 
binary of u-boot .

> -Scott

Best regards,
Marek Vasut

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/21/2012 01:43:24 PM, Marek Vasut wrote:
> Dear Scott Wood,
> > The awkwardness with naming based on nand/onenand/sd is that we no
> > longer have build infrastructure that is specific to the type of  
> boot
> > device -- and IIRC with some of the newer SPL targets, the same  
> image
> > works on multiple types of boot device.
> >
> > Having u-boot.bin be the final output regardless of internal
> > implementation details such as spl would avoid that problem, and be
> > even nicer to automated testing than the nand/onenand/sd names.
> 
> On the other hand, I use u-boot.bin and expect it to always be the  
> raw linked
> binary of u-boot .

What is U-Boot?  Is it the thing that SPL loads, or is it the entire  
package that pops out when I tell the U-Boot makefiles to build  
something?

Of course the raw binary of the thing that SPL loads would still be  
available under some new name.  Or come up with a new name for the  
final output, but I think the number of people that care about the  
final output is larger than the number of people that care about the  
raw binary of the thing that SPL loads.

As I said earlier, this is a situation where you can't please everyone,  
and I think it's better to have the current state of things be sane  
than to preserve one historical meaning of a particular target name  
rather than the other (originally there was no SPL and u-boot.bin was  
both the linker output and the final image to put into flash -- and  
this is still the case for many/most boards).

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Marek Vasut]

Dear Scott Wood,

> On 09/21/2012 01:43:24 PM, Marek Vasut wrote:
> > Dear Scott Wood,
> > 
> > > The awkwardness with naming based on nand/onenand/sd is that we no
> > > longer have build infrastructure that is specific to the type of
> > 
> > boot
> > 
> > > device -- and IIRC with some of the newer SPL targets, the same
> > 
> > image
> > 
> > > works on multiple types of boot device.
> > > 
> > > Having u-boot.bin be the final output regardless of internal
> > > implementation details such as spl would avoid that problem, and be
> > > even nicer to automated testing than the nand/onenand/sd names.
> > 
> > On the other hand, I use u-boot.bin and expect it to always be the
> > raw linked
> > binary of u-boot .
> 
> What is U-Boot?  Is it the thing that SPL loads, or is it the entire
> package that pops out when I tell the U-Boot makefiles to build
> something?
> 
> Of course the raw binary of the thing that SPL loads would still be
> available under some new name.  Or come up with a new name for the
> final output, but I think the number of people that care about the
> final output is larger than the number of people that care about the
> raw binary of the thing that SPL loads.
> 
> As I said earlier, this is a situation where you can't please everyone,
> and I think it's better to have the current state of things be sane
> than to preserve one historical meaning of a particular target name
> rather than the other (originally there was no SPL and u-boot.bin was
> both the linker output and the final image to put into flash -- and
> this is still the case for many/most boards).

Leave u-boot.bin be, that's the u-boot binary ... the new name might be u-
boot.img (as in flash image), what do you say ?

> -Scott

Best regards,
Marek Vasut

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Scott Wood]

On 09/21/2012 02:24:04 PM, Marek Vasut wrote:
> Dear Scott Wood,
> 
> > On 09/21/2012 01:43:24 PM, Marek Vasut wrote:
> > > Dear Scott Wood,
> > >
> > > > The awkwardness with naming based on nand/onenand/sd is that we  
> no
> > > > longer have build infrastructure that is specific to the type of
> > >
> > > boot
> > >
> > > > device -- and IIRC with some of the newer SPL targets, the same
> > >
> > > image
> > >
> > > > works on multiple types of boot device.
> > > >
> > > > Having u-boot.bin be the final output regardless of internal
> > > > implementation details such as spl would avoid that problem,  
> and be
> > > > even nicer to automated testing than the nand/onenand/sd names.
> > >
> > > On the other hand, I use u-boot.bin and expect it to always be the
> > > raw linked
> > > binary of u-boot .
> >
> > What is U-Boot?  Is it the thing that SPL loads, or is it the entire
> > package that pops out when I tell the U-Boot makefiles to build
> > something?
> >
> > Of course the raw binary of the thing that SPL loads would still be
> > available under some new name.  Or come up with a new name for the
> > final output, but I think the number of people that care about the
> > final output is larger than the number of people that care about the
> > raw binary of the thing that SPL loads.
> >
> > As I said earlier, this is a situation where you can't please  
> everyone,
> > and I think it's better to have the current state of things be sane
> > than to preserve one historical meaning of a particular target name
> > rather than the other (originally there was no SPL and u-boot.bin  
> was
> > both the linker output and the final image to put into flash -- and
> > this is still the case for many/most boards).
> 
> Leave u-boot.bin be, that's the u-boot binary ...

So basically, argument by repetition. :-)

My point was that the introduction of SPL means there are two ways to  
interpret the phrase "the u-boot binary".

> the new name might be u-boot.img (as in flash image), what do you say  
> ?

Whatever, at least it doesn't have the SoC name in it.  But again I  
think you're causing more problems/confusion changing the final output  
name than changing the result of a particular objcopy operation.

-Scott

[U-Boot] [PATCH v4 10/11] Add u-boot-pad.bin target to the Makefile

[Wolfgang Denk]

Dear Marek Vasut,

In message <201209212124.05075.marex@denx.de> you wrote:
> 
> Leave u-boot.bin be, that's the u-boot binary ... the new name might be u-
> boot.img (as in flash image), what do you say ?

Please re-read my earlier posting here:

http://article.gmane.org/gmane.comp.boot-loaders.u-boot/141749

Are there any strong arguments against my proposal?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If programming was easy, they wouldn't need something as  complicated
as a human being to do it, now would they?
                       - L. Wall & R. L. Schwartz, _Programming Perl_