From: Stefan Roese <sr@denx.de>
Date: Tue, 12 Sep 2006 06:49:07 +0000 (+0200)
Subject: Update NAND boot documentation
X-Git-Tag: U-Boot-1_1_5~32^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a73c8dbb437fb55ecb660cb962c8c1cc85b8a654;p=u-boot

Update NAND boot documentation
Patch by Stefan Roese, 12 Sep 2006
---

diff --git a/CHANGELOG b/CHANGELOG
index 4265049a2e..a6dc762348 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,10 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
-* Add documentation on the latest build environment extensions to 
+* Update NAND boot documentation
+  Patch by Stefan Roese, 12 Sep 2006
+
+* Add documentation on the latest build environment extensions to
   the README file.
 
 * Remove dead code (i2o and dma) from cpu/mpc824x/drivers/ directory.
diff --git a/Makefile b/Makefile
index 291dc61055..84d936701f 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ saved-output := $(BUILD_DIR)
 # Attempt to create a output directory.
 $(shell [ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR})
 
-# Verify if it was successful. 
+# Verify if it was successful.
 BUILD_DIR := $(shell cd $(BUILD_DIR) && /bin/pwd)
 $(if $(BUILD_DIR),,$(error output directory "$(saved-output)" does not exist))
 endif # ifneq ($(BUILD_DIR),)
@@ -272,7 +272,7 @@ $(NAND_SPL):	version
 		$(MAKE) -C nand_spl all
 
 $(U_BOOT_NAND):	$(NAND_SPL) $(obj)u-boot.bin
-		cat nand_spl/u-boot-spl-4k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
+		cat nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
 
 version:
 		@echo -n "#define U_BOOT_VERSION \"U-Boot " > $(VERSION_FILE); \
diff --git a/doc/README.nand-boot-ppc440 b/doc/README.nand-boot-ppc440
index a82a10ee6a..a1c1d8c444 100644
--- a/doc/README.nand-boot-ppc440
+++ b/doc/README.nand-boot-ppc440
@@ -33,4 +33,28 @@ is set up. While still running from cache, I experienced problems accessing
 the NAND controller.
 
 
+Example: Build and install NAND boot image for Sequoia (440EPx):
+
+a) Configure for sequoia with NAND boot support:
+# make sequoia_nand_config
+
+b) Build image(s)
+# make
+
+This will generate the SPL image in the "nand_spl" directory:
+nand_spl/u-boot-spl.bin
+Also another image is created spanning a whole NAND block (16kBytes):
+nand_spl/u-boot-spl-16k.bin
+The main NAND U-Boot image is generated in the toplevel directory:
+u-boot.bin
+A combined image of u-boot-spl-16k.bin and u-boot.bin is also created:
+u-boot-nand.bin
+
+This image should be programmed at offset 0 in the NAND flash:
+
+# tftp 100000 /tftpboot/sequoia/u-boot-nand.bin
+# nand erase 0 60000
+# nand write 100000 0 60000
+
+
 September 07 2006, Stefan Roese <sr@denx.de>
diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index 6c07e3dd8d..897aa8b6b7 100644
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -35,11 +35,11 @@ COBJS	= nand_boot.o ndfc.o sdram.o
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
 
-ALL	= u-boot-spl u-boot-spl.bin u-boot-spl-4k.bin
+ALL	= u-boot-spl u-boot-spl.bin u-boot-spl-16k.bin
 
 all:	$(obj).depend $(ALL)
 
-u-boot-spl-4k.bin: u-boot-spl
+u-boot-spl-16k.bin: u-boot-spl
 	$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@
 
 u-boot-spl.bin:	u-boot-spl