diff options
| -rwxr-xr-x | scripts/create.sh | 5 | ||||
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/mips/Makefile | 2 | ||||
| -rw-r--r-- | target/ppc/Makefile | 2 | ||||
| -rw-r--r-- | target/ppc64/Makefile | 2 | ||||
| -rw-r--r-- | target/sh/Makefile | 2 | ||||
| -rw-r--r-- | target/sparc/Makefile | 2 | ||||
| -rw-r--r-- | target/sparc64/Makefile | 2 |
8 files changed, 9 insertions, 10 deletions
diff --git a/scripts/create.sh b/scripts/create.sh index 505549247..e3fb7ac45 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -55,7 +55,7 @@ Syntax: $me [-c cfgfssize] [+g] [-i imagesize] [-p panictime] [-s serialspeed] [-t] [-T imagetype] [+U] target.ima source.tgz Explanation/Defaults: -c: minimum 0, maximum 5, default 1 (MiB) - +g: disables installing GNU GRUB 2 (-g enables it, default) + -g: enable installing GNU GRUB 2 -i: total image, default 512 (MiB; max. approx. 2 TiB) -p: default 10 (seconds; 0 disables; max. 300) -s: default 115200 (bps, others: 9600 19200 38400 57600) @@ -66,7 +66,7 @@ EOF } cfgfs=1 -usegrub=1 +usegrub=0 tgtmib=512 panicreboot=10 speed=115200 @@ -80,7 +80,6 @@ while getopts "c:ghi:p:s:tT:" ch; do usage fi ;; (g) usegrub=1 ;; - (+g) usegrub=0 ;; (h) usage 0 ;; (i) if (( (tgtmib = OPTARG) < 7 || tgtmib > 2097150 )); then print -u2 "$me: -i $OPTARG out of bounds" diff --git a/target/arm/Makefile b/target/arm/Makefile index a2bd23a8b..13f6ea62b 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -65,7 +65,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-arm -M $(MACH) -nographic $(NET) -kernel $(FW_DIR)/$(TARGET_KERNEL) -hda qemu-${CPU_ARCH}.img' endif diff --git a/target/mips/Makefile b/target/mips/Makefile index 436b570e3..bd3a763b6 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -101,7 +101,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} -nographic -M malta -device e1000,netdev=adk0 -netdev user,id=adk0 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/ppc/Makefile b/target/ppc/Makefile index aae63f1c0..fa1cd1698 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -17,7 +17,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-ppc -M mac99 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 6ee949a09..5b9c1caa6 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -17,7 +17,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-ppc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/sh/Makefile b/target/sh/Makefile index 0d5706eb3..12f8d0ce4 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -17,7 +17,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 1e15ee7f0..356f8745b 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -16,7 +16,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-sparc -M SS-5 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' endif diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 882189284..657d2ed4f 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -27,7 +27,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" @echo 'qemu-system-sparc64 $(QEMU_ARGS) -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif |