summaryrefslogtreecommitdiff
path: root/target/sh
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-04 18:42:45 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-04 18:42:45 +0100
commite9da3aa77efafebd9ec392d9898ed33619433c4c (patch)
tree1d012d830b7d3a3d70822b62297e220b0a36e5b3 /target/sh
parentfe79926211afc01f7109a3635e1e72a46b674848 (diff)
try to add support for graphical qemu
Diffstat (limited to 'target/sh')
-rw-r--r--target/sh/Makefile6
-rw-r--r--target/sh/kernel/qemu-sh23
-rw-r--r--target/sh/sys-available/qemu-sh43
-rw-r--r--target/sh/sys-available/qemu-sh4eb2
4 files changed, 5 insertions, 29 deletions
diff --git a/target/sh/Makefile b/target/sh/Makefile
index 98c5fb3ce..da733acac 100644
--- a/target/sh/Makefile
+++ b/target/sh/Makefile
@@ -18,7 +18,7 @@ ifneq ($(ADK_HARDWARE_QEMU),)
@echo "Use following command to create a QEMU Image:"
@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
- @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs)
@@ -28,7 +28,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+ @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
endif
endif
ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -37,6 +37,6 @@ imageinstall: createinitramfs
@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
- @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+ @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)'
endif
endif
diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh
index 9ea0e8595..5c38a01fb 100644
--- a/target/sh/kernel/qemu-sh
+++ b/target/sh/kernel/qemu-sh
@@ -13,6 +13,7 @@ CONFIG_SH_RTS7751R2D=y
CONFIG_RTS7751R2D_PLUS=y
CONFIG_SH_TIMER_TMU=y
CONFIG_SH_INTC=y
+CONFIG_CMDLINE_OVERWRITE=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_SCSI=y
@@ -34,25 +35,3 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
CONFIG_SERIAL_SH_SCI_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_MFD_SM501=y
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_SH_MOBILE_LCDC=m
-CONFIG_FB_SM501=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONT_8x16=y
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4
index c0382755a..83a645d65 100644
--- a/target/sh/sys-available/qemu-sh4
+++ b/target/sh/sys-available/qemu-sh4
@@ -4,9 +4,8 @@ config ADK_TARGET_SYSTEM_QEMU_SH4
select ADK_little
select ADK_qemu_sh4
select ADK_CPU_SH4
+ select ADK_KERNEL_CPU_LITTLE_ENDIAN
select ADK_HARDWARE_QEMU
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_USB
select ADK_USE_KERNEL_MINICONFIG
select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb
index 5f7a15c84..80389775e 100644
--- a/target/sh/sys-available/qemu-sh4eb
+++ b/target/sh/sys-available/qemu-sh4eb
@@ -6,8 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB
select ADK_CPU_SH4
select ADK_KERNEL_CPU_BIG_ENDIAN
select ADK_HARDWARE_QEMU
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_USB
select ADK_USE_KERNEL_MINICONFIG
select ADK_TARGET_KERNEL_ZIMAGE