diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/cris | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/cris')
| -rw-r--r-- | target/cris/Makefile | 7 | ||||
| -rw-r--r-- | target/cris/files/etc/network/interfaces | 5 | ||||
| -rw-r--r-- | target/cris/sys-available/toolchain-cris (renamed from target/cris/sys-available/toolchain) | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/target/cris/Makefile b/target/cris/Makefile index 5aa8b5e93..1e072f78e 100644 --- a/target/cris/Makefile +++ b/target/cris/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage $(TOOLS_BUILD_DIR): - mkdir -p $(TOOLS_BUILD_DIR) + @mkdir -p $(TOOLS_BUILD_DIR) tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C ../tools/mkfimage @@ -21,7 +21,7 @@ endif $(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/ kernel-install: tools-compile - PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(TARGET_KERNEL) + PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) @@ -36,7 +36,8 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL} - @echo Use sudo ./boot_linux -F -i ${TARGET_KERNEL} to flash the kernel + @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) + @echo Use sudo ./boot_linux -F -i $(BIN_DIR)/${TARGET_KERNEL} to flash the kernel @echo Do not forget to set network boot jumper, before you start the foxboard @echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server endif diff --git a/target/cris/files/etc/network/interfaces b/target/cris/files/etc/network/interfaces deleted file mode 100644 index 104c1a1b6..000000000 --- a/target/cris/files/etc/network/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet dhcp diff --git a/target/cris/sys-available/toolchain b/target/cris/sys-available/toolchain-cris index b6e462485..309b85d55 100644 --- a/target/cris/sys-available/toolchain +++ b/target/cris/sys-available/toolchain-cris @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS bool "Toolchain only" select ADK_cris - select ADK_toolchain + select ADK_toolchain_cris select ADK_TOOLCHAIN_ONLY help Build a cris toolchain. |