Use correct path to vmlinux, Fix bad SED of config

diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index b25c8f31c04f4b556e9b7e67bb38d14cf67d0bef..62ce86a68edf169a3f073dc99fbfb4d5ac23bac9 100644 (file)
--- 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