From e9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Jun 2010 10:38:59 +0200 Subject: fix busybox rebuild issue, simplify target Makefiles --- target/rb4xx/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'target/rb4xx/Makefile') diff --git a/target/rb4xx/Makefile b/target/rb4xx/Makefile index bf4e31b99..5bc9aba7e 100644 --- a/target/rb4xx/Makefile +++ b/target/rb4xx/Makefile @@ -16,18 +16,16 @@ kernel-install: $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) @cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \ $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),yaffs) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL) @echo 'The root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Format your NAND with Routerboot, boot via NFS and' - @echo 'then install kernel and filesystem:' + @echo 'then install kernel and filesystem via:' @echo 'adkinstall ${ROOTFSTARBALL}' - @echo 'Login as user root with password linux123 via ssh or console' endif -- cgit v1.2.3 From da28ccc6f848695609d32090142f1b4af0e27b17 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 6 Jul 2010 12:31:39 +0200 Subject: massive whitespace cleanup (EOL), suggested by j.seitter --- target/rb4xx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/rb4xx/Makefile') diff --git a/target/rb4xx/Makefile b/target/rb4xx/Makefile index 5bc9aba7e..b4e98a5a8 100644 --- a/target/rb4xx/Makefile +++ b/target/rb4xx/Makefile @@ -11,7 +11,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(TARGET_DIR)/boot/kernel + $(TARGET_DIR)/boot/kernel @cp $(TARGET_DIR)/boot/kernel \ $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel -- cgit v1.2.3