adm5120: convert to use the new mips multimachine stuff

[openwrt.git] / target / linux / x86 / image / Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 8df00c2..338c8e0 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -29,12 +29,11 @@ ifneq ($(GRUB_TERMINALS),)
   GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS)
 endif
 
   GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS)
 endif
 

+ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))

 
 ifneq ($(CONFIG_X86_GRUB_IMAGES),)
 
 ifneq ($(CONFIG_X86_GRUB_IMAGES),)

- ifneq ($(HOST_OS),Darwin)

 
   BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
 
   BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))

-  ROOTPART:=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART))

 
   define Image/cmdline/ext2
     root=$(ROOTPART) rootfstype=ext2 rootwait
 
   define Image/cmdline/ext2
     root=$(ROOTPART) rootfstype=ext2 rootwait


@@ -66,9 +65,9 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
                ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
                ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst

-       PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
+       PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \

                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \

-               $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \
+               $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \

                $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
        $(call Image/Build/grub/$(1))
   endef
                $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
        $(call Image/Build/grub/$(1))
   endef


@@ -83,24 +82,12 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
                $(KDIR)/
   endef
 
                $(KDIR)/
   endef
 

- else
-
-  define Image/Build/grub
-       PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh 
-               $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
-               $(CONFIG_X86_GRUB_KERNELPART) "" \
-               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
-  endef
-
- endif

 endif
 
 ROOTDELAY=10
 
 ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
 
 endif
 
 ROOTDELAY=10
 
 ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
 

-  ROOTPART:=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))
-

   define Image/cmdline/ext2
     root=$(ROOTPART) rootfstype=ext2 rootwait
   endef
   define Image/cmdline/ext2
     root=$(ROOTPART) rootfstype=ext2 rootwait
   endef


@@ -123,9 +110,9 @@ ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
        $(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
        sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
                ./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
        $(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
        sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
                ./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth

-       PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \
+       PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \

                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \

-               $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \
+               $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.bootscript \

                $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
   endef
 
                $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
   endef