Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 54 insertions, 0 deletions

diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index 5e52c8283..54978914c 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -67,4 +67,5 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC
 	default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100
+	default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI
 
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 9cc227d9b..5d82bb6c0 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -264,6 +264,7 @@ config ADK_TARGET_ROOTFS
 config ADK_PACKAGE_SUFFIX
 	string
 	default "ipk" if ADK_TARGET_PACKAGE_IPKG
+	default "ipk" if ADK_TARGET_PACKAGE_OPKG
 	default "tar.xz" if ADK_TARGET_PACKAGE_TXZ
 	help
 
@@ -285,6 +286,13 @@ config ADK_TARGET_PACKAGE_IPKG
 	select BUSYBOX_IPKG
 	help
 	  Create ipkg packages and use ipkg package management on the target.
+
+config ADK_TARGET_PACKAGE_OPKG
+	boolean
+	prompt "opkg"
+	select ADK_PACKAGE_OPKG
+	help
+	  Create opkg packages and use opkg package management on the target.
 	  
 endchoice
 
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 5c750717c..6cd70c8c4 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -128,6 +128,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 
 config ADK_KERNEL_MOUSE_PS2
@@ -138,6 +139,7 @@ config ADK_KERNEL_MOUSE_PS2
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_VBOX
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 
 config ADK_KERNEL_INPUT_EVDEV
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index c7999d84d..e1df1ef29 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -57,6 +57,11 @@ ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
+ifeq ($(ADK_TARGET_FS),nfsroot)
+targethelp:
+	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
+	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+endif
 
 # image creation and kernel install
 kernel-strip:
@@ -96,3 +101,6 @@ else
 imageinstall: createinitramfs targethelp
 endif
 endif
+ifeq ($(ADK_TARGET_FS),nfsroot)
+imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
+endif
diff --git a/target/ppc/kernel/apple-macmini b/target/ppc/kernel/apple-macmini
new file mode 100644
index 000000000..faa2196fa
--- /dev/null
+++ b/target/ppc/kernel/apple-macmini
@@ -0,0 +1,27 @@
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_32BIT=y
+CONFIG_PPC_BOOK3S_32=y
+CONFIG_PPC_BOOK3S=y
+CONFIG_6xx=y
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_PPC_OF=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_PPC_CHRP=y
+CONFIG_PPC_PMAC=y
+CONFIG_PPC_NATIVE=y
+CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
+CONFIG_MPIC=y
+CONFIG_PPC_I8259=y
+CONFIG_PPC_RTAS=y
+CONFIG_PPC_MPC106=y
+CONFIG_PPC_4K_PAGES=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_ADB=y
+CONFIG_ADB_CUDA=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_SERIAL_PMACZILOG=y
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/mac-mini
new file mode 100644
index 000000000..452b10580
--- /dev/null
+++ b/target/ppc/systems/mac-mini
@@ -0,0 +1,8 @@
+config ADK_TARGET_SYSTEM_APPLE_MACMINI
+	bool "Apple Mac mini"
+	select ADK_ppc
+	select ADK_apple_macmini
+	select ADK_CPU_PPC
+	help
+	 Support for Apple Mac mini.
+