From 4d589e31e932cc09a36a2ce9b5927ba21ee467fd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Tue, 8 Nov 2016 02:52:30 +0100
Subject: grub: rework package, add mips support, update to latest git

---
 target/x86/Makefile    | 19 ++++++++++++++++++-
 target/x86_64/Makefile | 10 ++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'target')

diff --git a/target/x86/Makefile b/target/x86/Makefile
index ba1961bca..3ff21095a 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -12,6 +12,10 @@ QEMU_ARGS:=-M pc
 QEMU_ARGS+=${ADK_QEMU_ARGS}
 QEMU_ARGS+=-net user -net nic,model=e1000
 
+ifeq ($(ADK_PACKAGE_GRUB_EFI_X86),y)
+QEMU_ARGS+=-L . -bios bios-x86.bin
+endif
+
 ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y)
 QEMU_ARGS+=-soundhw ac97
 endif
@@ -33,7 +37,7 @@ targethelp:
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
-	@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "$(CREATE) qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img'
@@ -83,6 +87,16 @@ ifeq ($(ADK_TARGET_FS),iso)
 targethelp:
 	@echo 'ISO image is at $<'
 endif
+ifeq ($(ADK_TARGET_FS),genimage)
+targethelp:
+	@echo "The disk image is: $(FW_DIR)/disk.img"
+	@echo "Use following command to install it on SD card:"
+ifeq ($(ADK_TARGET_QEMU),y)
+	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img'
+else
+	@echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+endif
+endif
 
 # image creation and kernel install
 kernel-strip:
@@ -104,6 +118,9 @@ endif
 ifeq ($(ADK_TARGET_FS),initramfspiggyback)
 imageinstall: createinitramfs targethelp
 endif
+ifeq (${ADK_TARGET_FS},genimage)
+imageinstall: ${FW_DIR}/${GENIMAGE} targethelp
+endif
 ifeq (${ADK_TARGET_FS},iso)
 imageinstall: ${FW_DIR}/${ROOTFSISO} targethelp
 endif
diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile
index dfaaa1e43..6445cff6c 100644
--- a/target/x86_64/Makefile
+++ b/target/x86_64/Makefile
@@ -8,11 +8,13 @@ include $(ADK_TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
 
 QEMU_ARCH:=x86_64
+
 QEMU_ARGS:=-M pc
-QEMU_ARGS+=-L . -bios bios.bin
+ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y)
+QEMU_ARGS+=-L . -bios bios-x86_64.bin
+endif
 QEMU_ARGS+=${ADK_QEMU_ARGS}
 QEMU_ARGS+=-net user -net nic,model=e1000
-
 ifeq ($(ADK_TARGET_QEMU_WITH_AUDIO),y)
 QEMU_ARGS+=-soundhw ac97
 endif
@@ -34,7 +36,7 @@ targethelp:
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
-	@echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
+	@echo "$(CREATE) qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"
 ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y)
 	@echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img'
@@ -78,7 +80,7 @@ endif
 ifeq ($(ADK_TARGET_FS),usb)
 targethelp:
 	@echo 'The root tarball is: ${FW_DIR}/${ROOTFSTARBALL}'
-	@echo "To install everything to USB use:"
+	@echo "To install everything to USB disk use:"
 	@echo "sudo ./scripts/install.sh -g -t default /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
 endif
 ifeq ($(ADK_TARGET_FS),iso)
-- 
cgit v1.2.3