changeset 1794:108f69f2c952

More sh2eb kernel build fixes.
author Rob Landley <rob@landley.net>
date Wed, 07 Oct 2015 18:23:06 -0500
parents d461b345c3c9
children bc3744e97367
files build.sh sources/targets/sh2eb system-image.sh
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/build.sh	Tue Oct 06 22:05:53 2015 -0500
+++ b/build.sh	Wed Oct 07 18:23:06 2015 -0500
@@ -159,7 +159,7 @@
 
 # Not trying to build nommu native compilers for the moment.
 
-if [ -z "$ELF2FLT" ] && not_already native-compiler
+if ! grep -q ELF2FLT sources/targets/"$ARCH" && not_already native-compiler
 then
   zap system-image
 
--- a/sources/targets/sh2eb	Tue Oct 06 22:05:53 2015 -0500
+++ b/sources/targets/sh2eb	Wed Oct 07 18:23:06 2015 -0500
@@ -11,7 +11,10 @@
 ELF2FLT=sh-unknown-linux
 BUILD_STATIC=all
 
-CONSOLE="ttySC1 noiotrap"
+CONSOLE="ttyUL0 noiotrap"
+
+NO_CPLUSPLUS=1
+SYSIMAGE_TYPE=rootfs
 
 UCLIBC_CONFIG="
 TARGET_sh=y
@@ -37,18 +40,17 @@
 CONFIG_DEVMEM=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FLATMEM_MANUAL=y
-CONFIG_INITRAMFS_SOURCE="initramfs"
 
 CONFIG_CMDLINE_EXTEND=y
-CONFIG_CMDLINE="console=ttyUL0"
+CONFIG_CMDLINE=\"console=$CONSOLE\"
 
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_0PF=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
 
 CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_NLS_DEFAULT="utf8"
+CONFIG_FAT_DEFAULT_IOCHARSET=\"utf8\"
+CONFIG_NLS_DEFAULT=\"utf8\"
 CONFIG_NLS_UTF8=y
 "
 
--- a/system-image.sh	Tue Oct 06 22:05:53 2015 -0500
+++ b/system-image.sh	Wed Oct 07 18:23:06 2015 -0500
@@ -80,7 +80,7 @@
   setupfor linux
   getconfig linux > mini.conf
   [ "$SYSIMAGE_TYPE" == rootfs ] &&
-    echo -e "CONFIG_INITRAMFS_SOURCE=\"$BUILD/root-filesystem-$ARCH/rootfs.cpio.gz\"\n" \
+    echo -e "CONFIG_INITRAMFS_SOURCE=\"$STAGE_DIR/rootfs.cpio.gz\"\n" \
       >> mini.conf
   make ARCH=${BOOT_KARCH:-$KARCH} $LINUX_FLAGS KCONFIG_ALLCONFIG=mini.conf \
     allnoconfig >/dev/null &&