Browse Source

use zimage and build kernel without serial drivers, otherwise kernel gets to big for the voyager

Waldemar Brodkorb 10 years ago
parent
commit
b5635d2d44
3 changed files with 16 additions and 11 deletions
  1. 12 5
      target/sparc/Makefile
  2. 3 4
      target/sparc/kernel/sun-voyager
  3. 1 2
      target/sparc/systems/sun-voyager

+ 12 - 5
target/sparc/Makefile

@@ -7,11 +7,13 @@ include $(ADK_TOPDIR)/mk/modules.mk
 include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
+OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug 
+OSTRIP+=-R .note.gnu.build-id -K sun4u_init -K _end -K _start
+
 ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/sparc/boot/zImage
-endif
-ifeq ($(ADK_TARGET_KERNEL_VMLINUX_AOUT),y)
-KERNEL:=$(LINUX_DIR)/arch/sparc/boot/vmlinux.aout
+else
+KERNEL:=$(LINUX_DIR)/vmlinux
 endif
 
 QEMU_ARGS:=-M SS-10
@@ -62,10 +64,15 @@ endif
 
 # image creation and kernel install
 kernel-strip:
+	cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 
-kernel-install: kernel-strip
-	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
+kernel-install:
+ifeq ($(ADK_TARGET_SYSTEM_SUN_VOYAGER),y)
+	PATH='$(HOST_PATH)' elftoaout -o $(FW_DIR)/$(TARGET_KERNEL) $(KERNEL)
+else
+	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
+endif
 
 # filesystem specific targets
 ifeq ($(ADK_TARGET_FS),archive)

+ 3 - 4
target/sparc/kernel/sun-voyager

@@ -2,8 +2,7 @@ CONFIG_SPARC=y
 CONFIG_SPARC32=y
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
+CONFIG_SUN_AUXIO=y
+CONFIG_SUN_IO=y
 CONFIG_PCIC_PCI=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SERIAL_SUNCORE=y
-CONFIG_SERIAL_SUNZILOG=y
-CONFIG_SERIAL_SUNZILOG_CONSOLE=y
+CONFIG_PROM_CONSOLE=y

+ 1 - 2
target/sparc/systems/sun-voyager

@@ -2,8 +2,7 @@ config ADK_TARGET_SYSTEM_SUN_VOYAGER
 	bool "Sun Voyager"
 	select ADK_CPU_SPARC_V8
 	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_KERNEL_VMLINUX_AOUT
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sun Voyager.