From 94b0c4698a9d50593baa9eba1bb46a829d59ecd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 28 Feb 2014 09:32:21 +0100
Subject: CONFIG_CC_OPTIMIZE_FOR_SIZE breaks microblaze bootup, remove it for
 now

---
 target/microblaze/kernel/qemu-microblaze-ml605      | 12 +-----------
 target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 12 +-----------
 2 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'target/microblaze')

diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605
index 7ae56f8c5..3c331795d 100644
--- a/target/microblaze/kernel/qemu-microblaze-ml605
+++ b/target/microblaze/kernel/qemu-microblaze-ml605
@@ -1,3 +1,4 @@
+CONFIG_MICROBLAZE=y
 CONFIG_PLATFORM_GENERIC=y
 CONFIG_OPT_LIB_FUNCTION=y
 CONFIG_KERNEL_BASE_ADDR=0x50000000
@@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1
 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_PCI=y
 CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
@@ -20,18 +20,8 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_XILINX=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_AXI_EMAC=y
-CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
index 652b68c03..c49b961b3 100644
--- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
@@ -1,3 +1,4 @@
+CONFIG_MICROBLAZE=y
 CONFIG_PLATFORM_GENERIC=y
 CONFIG_OPT_LIB_FUNCTION=y
 CONFIG_KERNEL_BASE_ADDR=0x90000000
@@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
 CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d"
-CONFIG_CMDLINE_FORCE=y
 CONFIG_PCI=y
 CONFIG_PCI_XILINX=y
 CONFIG_DTC=y
@@ -17,18 +17,8 @@ CONFIG_OF=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_XILINX=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
-CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
-- 
cgit v1.2.3


From 89bbde296b0f637b8aeb5e701a9fd10195dc0f41 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 08:56:17 +0100
Subject: cosmetic change avoid a whitespace

---
 target/microblaze/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'target/microblaze')

diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 7a411aa95..df05d9f6c 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -30,7 +30,7 @@ imageinstall: tools-compile $(BUILD_DIR)/root.squashfs
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),jffs2)
@@ -38,7 +38,7 @@ imageinstall: tools-compile $(FW_DIR)/$(ROOTFSJFFS2)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -48,7 +48,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -57,6 +57,6 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)'
+	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)'
 endif
 endif
-- 
cgit v1.2.3