diff options
Diffstat (limited to 'target/linux/olpc/image/Makefile')
| -rw-r--r-- | target/linux/olpc/image/Makefile | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/target/linux/olpc/image/Makefile b/target/linux/olpc/image/Makefile index b6d95042aa..b433ac45a0 100644 --- a/target/linux/olpc/image/Makefile +++ b/target/linux/olpc/image/Makefile @@ -8,12 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin -BOOTOPTS=$(strip $(subst ",, $(CONFIG_OLPC_GRUB_BOOTOPTS))) -ROOTPART=$(strip $(subst ",, $(CONFIG_OLPC_GRUB_ROOTPART))) +ROOTPART=$(strip $(subst ",, $(CONFIG_OLPC_BOOTSCRIPT_ROOTPART))) #"))")) # fix vim's broken syntax highlighting -ifeq ($(CONFIG_OLPC_GRUB_IMAGES),y) +ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y) define Image/cmdline/squashfs block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit endef @@ -30,37 +29,18 @@ ifeq ($(CONFIG_OLPC_GRUB_IMAGES),y) root=$(ROOTPART) rootfstype=ext2 init=/etc/preinit endef - define Image/Build/grub + define Image/Build/bootscript # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub - $(CP) \ - $(KDIR)/*stage* \ - $(KDIR)/root.grub/boot/grub/ - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz - $(CP) ./olpc.fth $(KDIR)/root.grub/boot/olpc.fth - sed \ - -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ - -e 's#@BAUDRATE@#$(CONFIG_OLPC_GRUB_BAUDRATE)#g' \ - ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst - PADDING="$(CONFIG_OLPC_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_OLPC_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) - $(call Image/Build/grub/$(1)) - endef -endif - -ifeq ($(CONFIG_OLPC_GRUB_IMAGES),y) - define Image/Prepare/grub - # for the image builder - $(CP) \ - $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage1 \ - $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2 \ - $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ - $(KDIR)/ + $(INSTALL_DIR) $(KDIR)/root.bootscript/boot + $(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz + $(CP) ./olpc.fth $(KDIR)/root.bootscript/boot/olpc.fth + PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) endef endif define Image/Prepare $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage - $(call Image/Prepare/grub) + $(call Image/Prepare/bootscript) endef define Image/Build/squashfs @@ -73,7 +53,7 @@ endef define Image/Build $(call Image/Build/$(1)) - $(call Image/Build/grub,$(1)) + $(call Image/Build/bootscript,$(1)) $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz endef |