projects / openwrt / svn-archive / archive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs...
[openwrt/svn-archive/archive.git] / target / linux / x86 / image / Makefile
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index e52c74919d8c43d55b9f073829104245eaac3a40..a5f772251846661a6131eae93524ff7faf01cd36 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -9,11 +9,20 @@ include $(INCLUDE_DIR)/image.mk
 
 export PATH=$(TARGET_PATH):/sbin
 
+GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
+GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga
 GRUB_TERMINALS =
 GRUB_SERIAL_CONFIG =
 GRUB_TERMINAL_CONFIG =
 GRUB_CONSOLE_CMDLINE =
 
+USE_ATKBD = generic kvm_guest
+
+ifneq ($(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget))),)
+  GRUB2_MODULES += at_keyboard
+  GRUB2_MODULES_ISO += at_keyboard
+endif
+
 ifneq ($(CONFIG_X86_GRUB_CONSOLE),)
   GRUB_CONSOLE_CMDLINE += console=tty0
   GRUB_TERMINALS += console
@@ -26,7 +35,7 @@ ifneq ($(CONFIG_X86_GRUB_SERIAL),)
 endif
 
 ifneq ($(GRUB_TERMINALS),)
-  GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS)
+  GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS)
 endif
 
 ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
@@ -40,7 +49,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
   define Image/cmdline/ext4
     root=$(ROOTPART) rootfstype=ext4 rootwait
   endef
-  
+
   define Image/cmdline/jffs2-64k
     block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait
   endef
@@ -53,38 +62,35 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
     block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait
   endef
 
-  define Image/Build/grub
+  define Image/Build/grub2
        # left here because the image builder doesnt need these
-       $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
-       $(CP) \
-               $(KDIR)/stage1 \
-               $(KDIR)/stage2 \
-               $(KDIR)/e2fs_stage1_5 \
-               $(KDIR)/root.grub/boot/grub/
+       $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
        $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+       grub-mkimage \
+               -o $(KDIR)/grub2/core.img \
+               -O i386-pc \
+               -c ./grub-early.cfg \
+               $(GRUB2_MODULES)
+       $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/
+       echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map
        sed \
                -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
                -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
-               ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
-       PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \
+               ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+       PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_generic.sh \
                $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
-               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
+               256
+       grub-bios-setup \
+               --device-map="$(KDIR)/grub2/device.map" \
+               -d "$(KDIR)/grub2" \
+               -r "hd0,msdos1" \
+               "$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img"
        $(call Image/Build/grub/$(1))
   endef
-
-  define Image/Prepare/grub
-       # for the image builder
-       $(CP) \
-               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage1 \
-               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2 \
-               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2_eltorito \
-               $(STAGING_DIR)/usr/lib/grub/i386-openwrt/e2fs_stage1_5 \
-               $(KDIR)/
-  endef
-
 endif
 
 ROOTDELAY=10
@@ -125,21 +131,28 @@ define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
 
-define Image/Build/iso 
-       $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
-       $(CP) \
-               $(KDIR)/stage2_eltorito \
-               $(KDIR)/root.grub/boot/grub/ 
+define Image/Build/iso
+       $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+       $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+       grub-mkimage \
+               -o $(KDIR)/grub2/eltorito.img \
+               -O i386-pc \
+               -c ./grub-early.cfg \
+               $(GRUB2_MODULES_ISO)
+       cat \
+               $(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \
+               $(KDIR)/grub2/eltorito.img \
+               > $(KDIR)/root.grub/boot/grub/eltorito.img
        sed \
                -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
                -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
-               -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
-               -e 's#(hd0,0)#(cd)#g' \
-               ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
-       $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz 
-       mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \
-               -o $(KDIR)/root.iso $(KDIR)/root.grub 
-endef 
+               -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
+               -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \
+               ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
+       $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
+       mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \
+               -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR)
+endef
 
 ifneq ($(CONFIG_X86_VDI_IMAGES),)
   define Image/Build/vdi
@@ -176,12 +189,17 @@ ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
   define Image/Build/gzip/ext4
        $(call Image/Build/gzip,ext4)
   endef
-  define Image/Build/gzip/jffs2-64k
+  ifneq ($(CONFIG_TARGET_IMAGES_PAD),)
+    define Image/Build/gzip/squashfs
+       $(call Image/Build/gzip,squashfs)
+    endef
+    define Image/Build/gzip/jffs2-64k
        $(call Image/Build/gzip,jffs2-64k)
-  endef
-  define Image/Build/gzip/jffs2-128k
+    endef
+    define Image/Build/gzip/jffs2-128k
        $(call Image/Build/gzip,jffs2-128k)
-  endef
+    endef
+  endif
 endif
 
 define Image/BuildKernel
@@ -195,23 +213,57 @@ define Image/BuildKernel
   endif
 endef
 
+define Image/Build/Profile/ar525w
+       cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+       $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32
+       $(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w.img
+       $(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w-web.img
+endef
+
+define Image/Build/Profile/sitecom
+       cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+       #32k config data + 20 bytes header + 2 bytes checksum after kernel image
+       $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790
+       $(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img
+       cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
+       cp $(KDIR)/tmp.img $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sitecom.img
+       rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp
+endef
+
+define Image/Build/Profile/bifferboard
+       $(TOPDIR)/target/linux/rdc/image/mkimg_bifferboard.py $(KDIR)/bzImage $(KDIR)/root.$(1) \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(1)-bifferboard.img
+endef
+
 define Image/Prepare
        $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
        $(call Image/Prepare/bootscript)
-       $(call Image/Prepare/grub)
+       $(call Image/Prepare/grub2)
+endef
+
+define Image/Build/Initramfs
+       $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage
 endef
 
 define Image/Build
        $(call Image/Build/$(1))
        $(call Image/Build/bootscript,$(1))
   ifneq ($(1),iso)
-       $(call Image/Build/grub,$(1))
+       $(call Image/Build/grub2,$(1))
        $(call Image/Build/vdi,$(1))
        $(call Image/Build/vmdk,$(1))
-  endif
        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+  else
+       $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
+  endif
        $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
        $(call Image/Build/gzip/$(1))
+       $(call Image/Build/Profile/$(PROFILE),$(1))
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+       $(call Image/Build/Initramfs)
+endif
 endef
 
 $(eval $(call BuildImage))
OpenWrt SVN history