diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 21:39:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 21:39:03 +0100 |
| commit | 34da02660d64fce49cf203abd93ae26d69bff634 (patch) | |
| tree | 0bc8cdff912095ca86d248666a6cc0451370ee19 | |
| parent | 483e9fde0b3923169c3c70720ca94b032dd30ae8 (diff) | |
make switch work, use ROOTFSUSERTARBALL where appropriate
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | target/ag241/Makefile | 6 | ||||
| -rw-r--r-- | target/foxboard/Makefile | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 19388ad89..5b011a2c5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -138,8 +138,10 @@ switch: echo "Saving configuration for target: ${ADK_TARGET}" cp -p .config .config.${ADK_TARGET} if [ -f .config.old ];then cp -p .config.old .config.old.${ADK_TARGET};fi + if [ -f .config.split ];then cp -p .config.split .config.split.${ADK_TARGET};fi if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \ cp -p .config.old.${TARGET} .config.old; \ + cp -p .config.split.${TARGET} .config.split; \ echo "Setting configuration to target: ${TARGET}"; \ else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi diff --git a/target/ag241/Makefile b/target/ag241/Makefile index f6bba9c85..cb8ce4a71 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -25,7 +25,7 @@ kernel-install: tools-compile $(LINUX_DIR)/vmlinux.tmp PATH='${TARGET_PATH}' \ addpattern -p AG3B -b -r 2.0 -i $(LINUX_DIR)/vmlinux.tmp \ - -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel 2>/dev/null ifeq ($(FS),squashfs) imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) @@ -43,10 +43,10 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) endif ifeq ($(FS),nfsroot) -imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) +imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}' @echo 'You can flash the kernel via tftp:' @echo 'tftp 192.168.1.1' @echo 'tftp> binary' diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index dd6e167c2..7fdffd8f2 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -33,11 +33,11 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) fi endif ifeq ($(FS),nfsroot) -imageinstall: ${BIN_DIR}/${ROOTFSTARBALL} +imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL} @echo @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel @echo Do not forget to set network boot jumper, before you start the foxboard - @echo ${ROOTFSTARBALL} is your nfs root and can be extracted on your nfs server + @echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif |