From 3ba3ea17ba671bf4bd7632fffa3d37728112acd4 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Tue, 28 Nov 2006 20:14:41 +0000 Subject: move target/image/platform to target/linux/platform/image platform directories are now self contained git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5669 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/image/x86/Config.in | 30 ---------------- target/image/x86/Makefile | 62 --------------------------------- target/image/x86/gen_image.sh | 60 -------------------------------- target/image/x86/grub/Makefile | 79 ------------------------------------------ target/image/x86/grub/menu.lst | 11 ------ 5 files changed, 242 deletions(-) delete mode 100644 target/image/x86/Config.in delete mode 100644 target/image/x86/Makefile delete mode 100755 target/image/x86/gen_image.sh delete mode 100644 target/image/x86/grub/Makefile delete mode 100644 target/image/x86/grub/menu.lst (limited to 'target/image/x86') diff --git a/target/image/x86/Config.in b/target/image/x86/Config.in deleted file mode 100644 index 511a8d9d09..0000000000 --- a/target/image/x86/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -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_ROOTPART - string - prompt "Root partition on target device" if X86_GRUB_IMAGES - default "/dev/hda2" - help - The root partition on the final device. If you don't know, - you probably want the default (/dev/hda2). - -config X86_GRUB_BOOTOPTS - string - prompt "Extra kernel boot options" if X86_GRUB_IMAGES - default "" - help - If you don't know, just leave it blank. diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile deleted file mode 100644 index 7aa03b2d27..0000000000 --- a/target/image/x86/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk - -export PATH=$(TARGET_PATH):/sbin -ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART))) -#")) # fix vim's broken syntax highlighting - - -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=$(ROOTPART),65536 root=/dev/mtdblock0 rootfstype=jffs2 - endef - - define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072 root=/dev/mtdblock0 rootfstype=jffs2 - endef - - define Image/cmdline/ext2 - root=$(ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS) - 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_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) - endef -endif - -define Image/Build - $(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)) - -$(eval $(call RequireCommand,fdisk, \ - Please install fdisk \ -)) diff --git a/target/image/x86/gen_image.sh b/target/image/x86/gen_image.sh deleted file mode 100755 index 21deeee6ac..0000000000 --- a/target/image/x86/gen_image.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash -# 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 <