Browse Source

lm32: revert to the old kernel, which boots up with lpj set via append

Bootup until a hello world:
[    0.000000] BINFMT_FLAT: Loading file: /init
[    0.000000] Mapping is 47438000, Entry point is 44, data_start is 1f00
[    0.000000] Load /init: TEXT=47438040-47439f00 DATA=47439f20-4743a0f0 BSS=4743a0f0-4743c130

Stopps here. :(
Waldemar Brodkorb 8 months ago
parent
commit
105abdcfe9

+ 1 - 1
package/busybox/config/miscutils/Config.in

@@ -701,7 +701,7 @@ config BUSYBOX_RX
 	Receive files using the Xmodem protocol.
 config BUSYBOX_SEEDRNG
 	bool "seedrng (1.3 kb)"
-	default y
+	default n
 	help
 	Seed the kernel RNG from seed files, meant to be called
 	once during startup, once during shutdown, and optionally

+ 0 - 2
target/config/Config.in.binutils

@@ -18,7 +18,6 @@ config ADK_TOOLCHAIN_BINUTILS_GIT
 config ADK_TOOLCHAIN_BINUTILS_2_41
 	bool "2.41"
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_LM32
 	depends on !ADK_TARGET_ARCH_KVX
 
 config ADK_TOOLCHAIN_BINUTILS_2_40
@@ -37,7 +36,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_38
 
 config ADK_TOOLCHAIN_BINUTILS_2_28
 	bool "2.28"
-	depends on ADK_TARGET_CPU_SH_J2
 
 config ADK_TOOLCHAIN_BINUTILS_KVX
 	bool "kvx-coolidge"

+ 4 - 1
target/config/Config.in.elf2flt

@@ -15,7 +15,10 @@ config ADK_TOOLCHAIN_ELF2FLT_2021_08
 config ADK_TOOLCHAIN_ELF2FLT_OLD
 	bool "old version"
 	depends on ADK_TARGET_ARCH_BFIN || \
-		ADK_TARGET_ARCH_LM32 || \
 		ADK_TARGET_ARCH_SH
 
+config ADK_TOOLCHAIN_ELF2FLT_LM32
+	bool "lm32"
+	depends on ADK_TARGET_ARCH_LM32
+
 endchoice

+ 4 - 3
target/linux/Config.in.kernelversion

@@ -181,7 +181,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO
 	default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "https://git.phytec.de/git/linux-ti.git" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	default "https://github.com/kalray/linux_coolidge.git" if ADK_TARGET_ARCH_KVX
-	default "https://github.com/shenki/linux-lm32.git" if ADK_TARGET_ARCH_LM32
+	default "https://github.com/m-labs/linux-milkymist.git" if ADK_TARGET_ARCH_LM32
 	default "https://github.com/radxa/kernel.git" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
 	help
@@ -207,7 +207,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX
-	default "b6a72d383cf0d4c9c448c1f4e5e8d496ea5c1fd8" if ADK_TARGET_ARCH_LM32
+	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "dc419608fb4e13bf1e33e6add31860730dd953fa" if ADK_TARGET_BOARD_BCM28XX
 	default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
 	default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70
@@ -228,12 +228,13 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER
 	default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "3.14.79" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	default "4.8.0" if ADK_TARGET_SYSTEM_QEMU_LM32
+	default "3.6.0" if ADK_TARGET_SYSTEM_QEMU_LM32
 	default "5.8.12" if ADK_TARGET_ARCH_KVX
 
 config ADK_TARGET_LINUX_KERNEL_GIT_TYPE
 	string
 	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
+	default "branch" if ADK_TARGET_LINUX_ARCH_LM32
 	default "branch" if ADK_TARGET_LINUX_ARCH_LOONGARCH 
 	default "branch" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	default "branch" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS

+ 1 - 1
target/lm32/Makefile

@@ -8,7 +8,7 @@ include $(ADK_TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/arch/lm32/boot/simpleImage.milkymist_one
 
 QEMU_ARGS:=-M milkymist 
-QEMU_ARGS+=-nographic -nodefaults -monitor pty -serial stdio -append "console=ttyS0"
+QEMU_ARGS+=-nographic -monitor pty -serial stdio -append "console=ttyS0 lpj=250"
 #
 # target helper text
 ifeq ($(ADK_TARGET_FS),archive)

+ 4 - 66
target/lm32/kernel/qemu-lm32

@@ -1,67 +1,5 @@
-CONFIG_BUG=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_FHANDLE is not set
-CONFIG_LOG_BUF_SHIFT=12
+CONFIG_LM32=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_ELF_CORE is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_EPOLL is not set
-# CONFIG_SIGNALFD is not set
-# CONFIG_EVENTFD is not set
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_HZ_100=y
-# CONFIG_BINFMT_ELF_FDPIC is not set
-CONFIG_BINFMT_FLAT=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=1
-CONFIG_BLK_DEV_RAM_SIZE=8192
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_MILKYMIST=y
-CONFIG_SERIAL_MILKYMIST_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_CRYPTO_ECHAINIV=y
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=y
+CONFIG_BUG=y
+CONFIG_BINFMT_MISC=y
+CONFIG_RD_GZIP=y

+ 6 - 0
toolchain/elf2flt/Makefile.inc

@@ -14,3 +14,9 @@ PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_SITES:=		https://github.com/uclinux-dev/elf2flt.git
 endif
+ifeq ($(ADK_TOOLCHAIN_ELF2FLT_LM32),y)
+PKG_VERSION:=		3051fec89bbd30de6f952dc3100712feff3ca076
+PKG_GIT:=		hash
+PKG_RELEASE:=		1
+PKG_SITES:=		https://github.com/m-labs/elf2flt-lm32.git
+endif