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 /board/denx | |
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 'board/denx')
-rw-r--r-- | board/denx/m28evk/Kconfig | 23 | ||||
-rw-r--r-- | board/denx/m28evk/MAINTAINERS | 6 | ||||
-rw-r--r-- | board/denx/m53evk/Kconfig | 23 | ||||
-rw-r--r-- | board/denx/m53evk/MAINTAINERS | 6 |
4 files changed, 58 insertions, 0 deletions
diff --git a/board/denx/m28evk/Kconfig b/board/denx/m28evk/Kconfig new file mode 100644 index 0000000..05f79ad --- /dev/null +++ b/board/denx/m28evk/Kconfig @@ -0,0 +1,23 @@ +if TARGET_M28EVK + +config SYS_CPU + string + default "arm926ejs" + +config SYS_BOARD + string + default "m28evk" + +config SYS_VENDOR + string + default "denx" + +config SYS_SOC + string + default "mxs" + +config SYS_CONFIG_NAME + string + default "m28evk" + +endif diff --git a/board/denx/m28evk/MAINTAINERS b/board/denx/m28evk/MAINTAINERS new file mode 100644 index 0000000..b0535a9 --- /dev/null +++ b/board/denx/m28evk/MAINTAINERS @@ -0,0 +1,6 @@ +M28EVK BOARD +M: Marek Vasut <marek.vasut@gmail.com> +S: Maintained +F: board/denx/m28evk/ +F: include/configs/m28evk.h +F: configs/m28evk_defconfig diff --git a/board/denx/m53evk/Kconfig b/board/denx/m53evk/Kconfig new file mode 100644 index 0000000..5e3298c --- /dev/null +++ b/board/denx/m53evk/Kconfig @@ -0,0 +1,23 @@ +if TARGET_M53EVK + +config SYS_CPU + string + default "armv7" + +config SYS_BOARD + string + default "m53evk" + +config SYS_VENDOR + string + default "denx" + +config SYS_SOC + string + default "mx5" + +config SYS_CONFIG_NAME + string + default "m53evk" + +endif diff --git a/board/denx/m53evk/MAINTAINERS b/board/denx/m53evk/MAINTAINERS new file mode 100644 index 0000000..5d8c764 --- /dev/null +++ b/board/denx/m53evk/MAINTAINERS @@ -0,0 +1,6 @@ +M53EVK BOARD +M: Marek Vasut <marek.vasut@gmail.com> +S: Maintained +F: board/denx/m53evk/ +F: include/configs/m53evk.h +F: configs/m53evk_defconfig |