summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-23 09:32:21 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-23 09:32:21 (GMT)
commit245336100e42a050809afd700a1b26e21b39466e (patch)
tree80fb6f7fe3f9a8adc5d6c1aab1a356de05945853
parent1eadf796fec958bed24ec492603dba5bc790e167 (diff)
fix jffs2 boot for qemu-microblaze, CMDLINE_FORCE required
-rw-r--r--BUGS2
-rw-r--r--TODO2
-rw-r--r--mk/build.mk2
-rw-r--r--mk/image.mk2
-rw-r--r--target/linux/config/Config.in.spi6
-rw-r--r--target/microblaze/kernel/qemu-microblaze-ml6051
-rw-r--r--target/microblaze/kernel/qemu-microblaze-s3adsp18001
7 files changed, 13 insertions, 3 deletions
diff --git a/BUGS b/BUGS
index 70759ad..38c6130 100644
--- a/BUGS
+++ b/BUGS
@@ -2,4 +2,4 @@
- qemu-sh4: usb keyboard is broken
- qemu-arm: thumb mode with glibc does not boot
- qemu-sparc64: ide driver not working, only virtio (but unstable)
-- qemu-microblaze: network card emulation fails, little endian works
+- qemu-microblaze: ml605 early printk and network card emulation fails, little endian works
diff --git a/TODO b/TODO
index 0b1d510..987f9e9 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,6 @@
+- ipkg.conf url fixen
- hash-style=gnu for non-mips and non-musl
+- fix libiberty.a mess
- check gold for mozilla compile
- check for gcc and SSP again
- add daemon() function to functions.sh
diff --git a/mk/build.mk b/mk/build.mk
index bb2b754..ba9c023 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -99,7 +99,7 @@ POSTCONFIG= -@\
touch .rebuild.busybox;\
rebuild=1;\
fi; \
- for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \
+ for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
touch .rebuild.base-files;\
rebuild=1;\
diff --git a/mk/image.mk b/mk/image.mk
index 8ae7e08..1e7a802 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -157,7 +157,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
-nopad -noappend -root-owned $(MAKE_TRACE)
${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
- ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -X zlib -r ${TARGET_DIR} \
+ ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -X zlib -r ${TARGET_DIR} \
--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 73db5e8..c130523 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -1,6 +1,12 @@
config ADK_KERNEL_SPI
boolean
+config ADK_KERNEL_SPI_MASTER
+ boolean
+
+config ADK_KERNEL_SPI_XILINX
+ boolean
+
config ADK_KERNEL_SPI_AR71XX
select ADK_KERNEL_SPI
boolean
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605
index 8d13c5d..cb8da0c 100644
--- a/target/microblaze/kernel/qemu-microblaze-ml605
+++ b/target/microblaze/kernel/qemu-microblaze-ml605
@@ -22,3 +22,4 @@ CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
index fc43ab5..3c3546b 100644
--- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
@@ -19,3 +19,4 @@ CONFIG_NET_VENDOR_XILINX=y
CONFIG_XILINX_EMACLITE=y
CONFIG_SERIAL_UARTLITE=y
CONFIG_SERIAL_UARTLITE_CONSOLE=y
+CONFIG_CMDLINE_FORCE=y