diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-04 13:20:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-06-04 13:20:22 +0200 |
| commit | d5ffc80ee620f21ddff9382c98ab7ba126bb46f7 (patch) | |
| tree | 328e9a7eb4508aaab1c3d3548c84468710c39f37 | |
| parent | 8c5767619d7023fe49ac0bf4f44b9c9b3ba49a8e (diff) | |
ci20 fixes
| -rw-r--r-- | target/config/Config.in.runtime | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.serial | 5 | ||||
| -rw-r--r-- | target/mips/Makefile | 8 | ||||
| -rw-r--r-- | target/mips/kernel/imgtec-ci20 | 3 | ||||
| -rw-r--r-- | target/mips/systems/imgtec-ci20 | 2 |
5 files changed, 18 insertions, 1 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 4c8034c8f..6ed3bc5b7 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -274,6 +274,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyPS0" if ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ default "ttysclp0" if ADK_TARGET_SYSTEM_QEMU_S390 default "ttyO0" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + default "ttyS4" if ADK_TARGET_SYSTEM_IMGTEC_CI20 default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index 1dc0e13a0..113599149 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -64,6 +64,9 @@ config ADK_KERNEL_SERIAL_BFIN_UART0 config ADK_KERNEL_SERIAL_BFIN_UART1 bool +config ADK_KERNEL_SERIAL_8250_INGENIC + bool + config ADK_KERNEL_SERIAL_BFIN bool "BFIN serial driver" select ADK_KERNEL_SERIAL_BFIN_CONSOLE @@ -75,6 +78,7 @@ config ADK_KERNEL_SERIAL_BFIN config ADK_KERNEL_SERIAL_8250 bool "8250 serial driver" select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ + || ADK_TARGET_SYSTEM_IMGTEC_CI20 \ || ADK_TARGET_SYSTEM_QEMU_XTENSA \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \ @@ -82,6 +86,7 @@ config ADK_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_OR1K_SIM select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU select ADK_KERNEL_SERIAL_8250_CONSOLE + select ADK_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20 depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ || ADK_TARGET_SYSTEM_IMGTEC_CI20 \ || ADK_TARGET_SYSTEM_LINKSYS_NSLU2 \ diff --git a/target/mips/Makefile b/target/mips/Makefile index 076e9aef7..72d814554 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -6,6 +6,10 @@ include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) +ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y) +KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage +endif + OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id QEMU_ARGS:=-M malta @@ -72,7 +76,11 @@ endif # image creation and kernel install kernel-strip: +ifeq ($(ADK_TARGET_KERNEL_UIMAGE),) $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) +else + @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) +endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} diff --git a/target/mips/kernel/imgtec-ci20 b/target/mips/kernel/imgtec-ci20 index e40370c50..ab99ec50e 100644 --- a/target/mips/kernel/imgtec-ci20 +++ b/target/mips/kernel/imgtec-ci20 @@ -2,3 +2,6 @@ CONFIG_MIPS=y CONFIG_MACH_INGENIC=y CONFIG_MACH_JZ4780=y CONFIG_JZ4780_CI20=y +CONFIG_CMDLINE_BOOL=y +CONFIG_SERIAL_8250_NR_UARTS=5 +CONFIG_SERIAL_8250_RUNTIME_UARTS=5 diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 5b2d80653..6f46de1fa 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -1,6 +1,5 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 bool "Imagination Creator CI20" - depends on ADK_EXPERIMENTAL depends on ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_MIPS_MIPS32R2 select ADK_TARGET_WITH_SERIAL @@ -11,6 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_WITH_COMPRESSION + select ADK_TARGET_KERNEL_UIMAGE help Support for Imagination Creator CI20. |