Prepare v2012.07

Signed-off-by: Wolfgang Denk <wd@denx.de>
hawkboard: Fix SPL Nand driver misconfiguration
2026-06-04 02:36:38 +03:00 · 2012-07-30 20:24:37 +02:00 · 2012-07-30 20:22:42 +02:00 · 2012-07-30 10:07:00 +02:00 · 2012-07-29 15:45:25 +02:00 · 2012-07-27 23:44:24 +02:00
3 changed files with 5 additions and 4 deletions
--- a/6
+++ b/6
@@ -24,7 +24,7 @@
 VERSION = 2012
 PATCHLEVEL = 07
 SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
@@ -617,7 +617,7 @@ $(obj)lib/asm-offsets.s:	$(obj)include/autoconf.mk.dep \

 $(obj)include/generated/asm-offsets.h:	$(obj)include/autoconf.mk.dep \
 	$(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
-	@echo Generating $@
+	@$(XECHO) Generating $@
 	tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@

 $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s:	$(obj)include/autoconf.mk.dep
@@ -792,7 +792,7 @@ clobber:	tidy
 	@rm -f $(obj)u-boot.dtb
 	@rm -f $(obj)u-boot.sb
 	@rm -f $(obj)u-boot.spr
-	@rm -f $(obj)tools/inca-swap-bytes
+	@rm -f $(obj)tools/xway-swap-bytes
 	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
 	@rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
 	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -123,6 +123,7 @@
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_NAND_DAVINCI
 #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
+#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST /* SPL nand driver configuration */
 #define CFG_DAVINCI_STD_NAND_LAYOUT
 #define CONFIG_SYS_NAND_CS		3
 #define CONFIG_SYS_NAND_PAGE_2K
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -9,7 +9,7 @@
 /ncb
 /ncp
 /ubsha1
-/inca-swap-bytes
+/xway-swap-bytes
 /*.exe
 /easylogo/easylogo
 /env/crc32.c
Author	SHA1	Message	Date
Wolfgang Denk	190649fb43	Prepare v2012.07 Signed-off-by: Wolfgang Denk <wd@denx.de>	2012-07-30 20:24:37 +02:00
Linu Cherian	9f0a371d2c	hawkboard: Fix SPL Nand driver misconfiguration Hawkboard was using the wrong nand_read_page version for SPL image. As a side effect, the u-boot image loaded by the SPL from nand was getting corrupted. Enable CONFIG_SYS_NAND_HW_ECC_OOBFIRST to select the correct nand_read_page algorithm for SPL. Signed-off-by: Linu Cherian <linucherian@gmail.com> Acked-by: Sughosh Ganu <urwithsughosh@gmail.com> Acked-by: Tom Rini <trini@ti.com>	2012-07-30 20:22:42 +02:00
Wolfgang Denk	69577ab6bd	Merge branch 'master' of git://git.denx.de/u-boot-mips * 'master' of git://git.denx.de/u-boot-mips: MIPS: fix renaming of inca-swap-bytes to xway-swap-bytes Signed-off-by: Wolfgang Denk <wd@denx.de>	2012-07-30 10:07:00 +02:00
Wolfgang Denk	b12734eed1	Makefile: avoid "Generating asm-offsets.h" message with "-s" make would spit out a message like Generating /tmp/build/include/generated/asm-offsets.h even when running with option "-s". Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de>	2012-07-29 15:45:25 +02:00
Daniel Schwierzeck	8b425b3f8e	MIPS: fix renaming of inca-swap-bytes to xway-swap-bytes Fix some remains of the renaming of inca-swap-bytes introduced in commit `60b74bde92` MIPS: INCA-IP: rename inca-swap-bytes host tool Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>	2012-07-27 23:44:24 +02:00