diff options
author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
tree | de701f5c90b7373966412d566b5c00d3837954bc /arch/mips | |
parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
download | u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 37 | ||||
-rw-r--r-- | arch/mips/config.mk | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig new file mode 100644 index 0000000..5bf0df4 --- /dev/null +++ b/arch/mips/Kconfig @@ -0,0 +1,37 @@ +menu "MIPS architecture" + depends on MIPS + +config SYS_ARCH + string + default "mips" + +choice + prompt "Target select" + +config TARGET_QEMU_MIPS + bool "Support qemu-mips" + +config TARGET_MALTA + bool "Support malta" + +config TARGET_VCT + bool "Support vct" + +config TARGET_DBAU1X00 + bool "Support dbau1x00" + +config TARGET_PB1X00 + bool "Support pb1x00" + +config TARGET_QEMU_MIPS64 + bool "Support qemu-mips64" + +endchoice + +source "board/dbau1x00/Kconfig" +source "board/imgtec/malta/Kconfig" +source "board/micronas/vct/Kconfig" +source "board/pb1x00/Kconfig" +source "board/qemu-mips/Kconfig" + +endmenu diff --git a/arch/mips/config.mk b/arch/mips/config.mk index f4a234a..a2d07af 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -25,7 +25,7 @@ endif # Default to EB if no endianess is configured ENDIANNESS ?= -EB -PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ +PLATFORM_CPPFLAGS += -D__MIPS__ __HAVE_ARCH_GENERIC_BOARD := y |