allow apple mac mini to netboot

7 files changed, 33 insertions, 9 deletions

diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 18ae17041..6a60ca7c9 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -194,6 +194,7 @@ source "target/config/Config.in.scripts"
 
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
+	default "32768" if ADK_TARGET_SYSTEM_APPLE_MACMINI
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_LENOVO_X200
 	default "32768" if ADK_TARGET_SYSTEM_SGI_O2
@@ -332,6 +333,7 @@ config ADK_RUNTIME_GETTY_VGA
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_APPLE_MACMINI
 	default y if ADK_TARGET_SYSTEM_LENOVO_X200
 	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_MODEL_PCENGINES_ALIX1C
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index ed1f5d393..39f0e8f55 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -66,6 +66,9 @@ config ADK_LINUX_KERNEL_NET_VENDOR_SMSC
 config ADK_LINUX_KERNEL_NET_VENDOR_STMICRO
 	bool
 
+config ADK_LINUX_KERNEL_NET_VENDOR_SUN
+	bool
+
 config ADK_LINUX_KERNEL_NET_VENDOR_XILINX
 	bool
 
@@ -508,6 +511,13 @@ config ADK_LINUX_KERNEL_STMMAC_ETH
 	default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK810
 	default n
 
+config ADK_LINUX_KERNEL_SUNGEM
+	bool "SUN GEM ethernet driver"
+	select ADK_LINUX_KERNEL_NET_VENDOR_SUN
+	depends on ADK_TARGET_SYSTEM_APPLE_MACMINI
+	default y if ADK_TARGET_SYSTEM_APPLE_MACMINI
+	default n
+
 config ADK_LINUX_KERNEL_ETHOC
 	bool "OpenCore ethernet driver"
 	select ADK_LINUX_KERNEL_PHYLIB
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 737b66a74..7e56717b8 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -217,6 +217,15 @@ config ADK_LINUX_KERNEL_FB_VESA
  	help
 	  Generic VESA Framebuffer support.
 
+config ADK_LINUX_KERNEL_FB_OF
+	bool "Framebuffer support for OpenFirmware"
+	select ADK_LINUX_KERNEL_FB
+	select ADK_LINUX_KERNEL_FRAMEBUFFER_CONSOLE
+	default y if ADK_TARGET_SYSTEM_APPLE_MACMINI
+ 	default n
+ 	help
+	  Generic OpenFirmware Framebuffer support.
+
 config ADK_LINUX_KERNEL_DRM_ETNAVIV
 	bool "DRM support for Vivante chips (Cubox-i/Hummingboard)"
 	select ADK_LINUX_KERNEL_DRM
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 25472a14e..7ed79b1d0 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -167,6 +167,7 @@ config ADK_LINUX_KERNEL_USB_OHCI_HCD
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_ASUS_P5BVM
+	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_APPLE_MACMINI
 	default m if ADK_TARGET_SYSTEM_ASUS_P5BVM
 	default m if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX
diff --git a/target/ppc/Makefile b/target/ppc/Makefile
index 2eec72d23..f62b31110 100644
--- a/target/ppc/Makefile
+++ b/target/ppc/Makefile
@@ -63,6 +63,12 @@ ifeq ($(ADK_TARGET_FS),nfsroot)
 targethelp:
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_APPLE_MACMINI),y)
+	@echo 'Use <alt-gr>-<win>-o-f to get into OpenFirmware on bootup, then type:'
+	@echo ' 0 > boot enet:10.0.0.1,yaboot'
+	@echo 'In yaboot type:'
+	@echo ' boot: enet:'
+endif
 endif
 
 # image creation and kernel install
diff --git a/target/ppc/kernel/apple-macmini b/target/ppc/kernel/apple-macmini
index faa2196fa..f2bccd3a9 100644
--- a/target/ppc/kernel/apple-macmini
+++ b/target/ppc/kernel/apple-macmini
@@ -8,8 +8,6 @@ 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
@@ -19,9 +17,5 @@ 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
+CONFIG_CMDLINE_BOOL=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/apple-macmini
index 9b3e97c17..c1652ee52 100644
--- a/target/ppc/systems/mac-mini
+++ b/target/ppc/systems/apple-macmini
@@ -1,10 +1,12 @@
 config ADK_TARGET_SYSTEM_APPLE_MACMINI
 	bool "Apple Mac mini"
-	select ADK_TARGET_CPU_PPC
+	select ADK_TARGET_CPU_PPC_7400
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
 	  Support for Apple Mac mini.