From d9960daaec8032ca21c071f86f37be4960829c76 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 8 Oct 2006 15:48:56 +0000 Subject: [PATCH] add grub based images for x86-2.6 - still a bit hackish, but works with ext2 and jffs2 SVN-Revision: 4962 --- openwrt/Config.in | 3 ++ openwrt/target/image/x86/Config.in | 20 +++++++++ openwrt/target/image/x86/Makefile | 41 +++++++++++++++++- openwrt/target/image/x86/gen_image.sh | 60 ++++++++++++++++++++++++++ openwrt/target/image/x86/grub/Makefile | 58 +++++++++++++++++++++++++ openwrt/target/image/x86/grub/menu.lst | 11 +++++ 6 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 openwrt/target/image/x86/Config.in create mode 100755 openwrt/target/image/x86/gen_image.sh create mode 100644 openwrt/target/image/x86/grub/Makefile create mode 100644 openwrt/target/image/x86/grub/menu.lst diff --git a/openwrt/Config.in b/openwrt/Config.in index 7b28255fb5..74b3696242 100644 --- a/openwrt/Config.in +++ b/openwrt/Config.in @@ -90,6 +90,9 @@ menu "Target Images" help Ext2 file system with some free space for uml images +comment "Image Options" + +source "target/image/*/Config.in" endmenu diff --git a/openwrt/target/image/x86/Config.in b/openwrt/target/image/x86/Config.in new file mode 100644 index 0000000000..fa61468c96 --- /dev/null +++ b/openwrt/target/image/x86/Config.in @@ -0,0 +1,20 @@ +config X86_GRUB_IMAGES + bool "Build GRUB images (Linux x86 or x86_64 host only)" + depends LINUX_2_6_X86 + depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 + default y + +config X86_GRUB_BAUDRATE + int "Serial port baud rate" + depends X86_GRUB_IMAGES + default 38400 + +config X86_GRUB_KERNELPART + int "Kernel partition size (in MB)" + depends X86_GRUB_IMAGES + default 4 + +config X86_GRUB_FSPART + int "Filesystem partition size (in MB)" + depends X86_GRUB_IMAGES + default 16 diff --git a/openwrt/target/image/x86/Makefile b/openwrt/target/image/x86/Makefile index 919ccbc9fe..b836f3ace6 100644 --- a/openwrt/target/image/x86/Makefile +++ b/openwrt/target/image/x86/Makefile @@ -7,9 +7,48 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +ifeq ($(CONFIG_X86_GRUB_IMAGES),y) + define Build/Compile + $(MAKE) -C grub compile + endef + + define Build/Clean + $(MAKE) -C grub clean + endef + + define Image/cmdline/jffs2-64k + block2mtd.block2mtd=/dev/hda2,65536 root=/dev/mtdblock0 rootfstype=jffs2 + endef + + define Image/cmdline/jffs2-128k + block2mtd.block2mtd=/dev/hda2,131072 root=/dev/mtdblock0 rootfstype=jffs2 + endef + + define Image/cmdline/ext2 + root=/dev/hda2 rootfstype=ext2 + endef + + define Image/Build/grub + mkdir -p $(KDIR)/root.grub/boot/grub + $(CP) \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ + $(KDIR)/root.grub/boot/grub/ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz + sed \ + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \ + -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ + ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst + PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_X86_GRUB_FSPART) $(KDIR)/root.$(1) + endef +endif + define Image/Build - cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + $(call Image/Build/grub,$(1)) + cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs cp $(LINUX_DIR)/arch/i386/boot/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef + $(eval $(call BuildImage)) diff --git a/openwrt/target/image/x86/gen_image.sh b/openwrt/target/image/x86/gen_image.sh new file mode 100755 index 0000000000..3edce1e406 --- /dev/null +++ b/openwrt/target/image/x86/gen_image.sh @@ -0,0 +1,60 @@ +#!/bin/sh +# Copyright (C) 2006 OpenWrt.org + +[ $# == 5 ] || { + echo "SYNTAX: $0 " + exit 1 +} + +file="$1" +part1s="$2" +part1d="$3" +part2s="$4" +part2f="$5" + +head=16 +sect=63 +cyl=$(( ($part1s + $part2s) * 1024 * 1024 / ($head * $sect * 512))) + +dd if=/dev/zero of="$file" bs=1M count=$(($part1s + $part2s)) 2>/dev/null || exit +fdisk -u -C $cyl -H $head -S $sect "$file" > /dev/null 2>/dev/null </dev/null && chpax -zp $(which grub) +grub --device-map=/dev/null <