diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-09-23 09:58:47 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-09-23 09:58:47 +0000 |
| commit | 7c012c0775f6bc293cc25fa859f6e271be01a1b6 (patch) | |
| tree | 4a0116c0d0bfabfaca272da9606d965f4879e09a | |
| parent | f45c2c661195d546d29ec4c3ca4f83eea3856030 (diff) | |
Use correct path to vmlinux, Fix bad SED of config
| -rw-r--r-- | target/linux/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in index b25c8f31c..62ce86a68 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -56,8 +56,12 @@ endif # Has to be set by the target/device ifndef LINUX26_BINLOC # default: +ifeq ($(LINUX26_FORMAT),vmlinux) +LINUX26_BINLOC=$(LINUX26_FORMAT) +else LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) endif +endif # File name for the Linux kernel binary ifndef LINUX26_KERNEL @@ -143,7 +147,7 @@ endif $(LINUX26_DIR)/.configured: $(LINUX26_DIR)/.patched $(LINUX26_KCONFIG) cp -dpf $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config - $(SED) '/CONFIG_AEABI/d' $(LINUX26_DIR)/.config + $(SED) '/CONFIG_AEABI=y/d' $(LINUX26_DIR)/.config ifeq ($(BR2_ARM_EABI),y) echo "CONFIG_AEABI=y" >> $(LINUX26_DIR)/.config $(SED) '/CONFIG_OABI_COMPAT/d' $(LINUX26_DIR)/.config @@ -151,7 +155,7 @@ ifeq ($(BR2_ARM_EABI),y) else echo "# CONFIG_AEABI is not set" >> $(LINUX26_DIR)/.config endif - $(SED) '/CONFIG_IPV6/d' $(LINUX26_DIR)/.config + $(SED) '/CONFIG_IPV6=y/d' $(LINUX26_DIR)/.config ifeq ($(BR2_INET_IPV6),y) echo "CONFIG_IPV6=y" >> $(LINUX26_DIR)/.config else |