Changeset c0a7545 in mainline

Timestamp:

2012-12-03T23:57:46Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

232cd4f

Parents:

ba5cff5

Message:

Support both endianities for MIPS Malta, resulting in lmalta and bmalta.

Files:

• HelenOS.config (modified) (5 diffs)
• boot/arch/mips32/Makefile.inc (modified) (1 diff)
• defaults/mips32/malta-be/Makefile.config (added)
• defaults/mips32/malta-le/Makefile.config (added)
• defaults/mips32/malta/Makefile.config (deleted)
• kernel/arch/mips32/Makefile.inc (modified) (1 diff)
• tools/autotool.py (modified) (1 diff)

HelenOS.config

@@ -46 +46 @@
 @ "bgxemul" GXEmul big endian
 @ "lgxemul" GXEmul little endian
-@ "malta" MIPS Malta Development Board
+@ "bmalta" MIPS Malta Development Board big endian
+@ "lmalta" MIPS Malta Development Board little endian
 ! [PLATFORM=mips32] MACHINE (choice)
 
@@ -105 +106 @@
 % CPU type
 @ "4Kc" MIPS 4Kc
-! [PLATFORM=mips32&MACHINE=malta] PROCESSOR (choice)
+! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] PROCESSOR (choice)
 
 % RAM disk format
@@ -185 +186 @@
 % User space architecture
 @ "mips32"
-! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul|MACHINE=malta)] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul|MACHINE=lmalta)] UARCH (choice)
 
 % User space architecture
 @ "mips32eb"
-! [PLATFORM=mips32&MACHINE=bgxemul] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=bmalta)] UARCH (choice)
 
 % User space architecture
@@ -263 +264 @@
 % Image format
 @ "elf"
-! [PLATFORM=mips32&MACHINE=malta] IMAGE (choice)
+! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
 
 % Image format
@@ -443 +444 @@
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=malta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
 
 % Output device class

boot/arch/mips32/Makefile.inc

@@ -49 +49 @@
         ENDIANESS = LE
 endif
-ifeq ($(MACHINE),malta)
+ifeq ($(MACHINE),lmalta)
         BFD_NAME = elf32-tradlittlemips
         BFD_OUTPUT = elf32-tradlittlemips 
         ENDIANESS = LE
+endif
+ifeq ($(MACHINE),bmalta)
+        BFD_NAME = elf32-tradbigmips
+        BFD_OUTPUT = elf32-tradbigmips 
+        ENDIANESS = BE
 endif
 

kernel/arch/mips32/Makefile.inc

@@ -49 +49 @@
         ENDIANESS = LE
 endif
-ifeq ($(MACHINE),malta)
+ifeq ($(MACHINE),bmalta)
+        BFD_NAME = elf32-tradbigmips
+        ENDIANESS = BE
+        GCC_CFLAGS += -D__BE__
+endif
+ifeq ($(MACHINE),lmalta)
         BFD_NAME = elf32-tradlittlemips
         ENDIANESS = LE

tools/autotool.py

@@ -676 +676 @@
                                 common['CC_ARGS'].append("-mabi=32")
                                 
-                                if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim") or (config['MACHINE'] == 'malta')):
+                                if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):
                                         target = config['PLATFORM']
                                         gnu_target = "mipsel-linux-gnu"
                                 
-                                if (config['MACHINE'] == "bgxemul"):
+                                if ((config['MACHINE'] == "bgxemul") or (config['MACHINE'] == "bmalta")):
                                         target = "mips32eb"
                                         gnu_target = "mips-linux-gnu"