diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-13 10:25:40 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-13 10:25:40 +0200 |
| commit | 5d5269f87fc00a3fe1960cacd92e3d04864dff7d (patch) | |
| tree | 208a387f1e0f0399696132e556e58b36e6072efd /Makefile | |
| parent | a87d46f7327eedead89284a0d0c5e5a769b984b9 (diff) | |
| parent | d12ae80889568365ecb9e6698322f9771ae76dde (diff) | |
| download | u-boot-imx-5d5269f87fc00a3fe1960cacd92e3d04864dff7d.zip u-boot-imx-5d5269f87fc00a3fe1960cacd92e3d04864dff7d.tar.gz u-boot-imx-5d5269f87fc00a3fe1960cacd92e3d04864dff7d.tar.bz2 | |
Merge with /home/sr/git/u-boot/denx
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); \ |