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/Marvell/guruplug | |
parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
download | blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz blackbird-obmc-uboot-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip |
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/Marvell/guruplug')
-rw-r--r-- | board/Marvell/guruplug/Kconfig | 23 | ||||
-rw-r--r-- | board/Marvell/guruplug/MAINTAINERS | 6 |
2 files changed, 29 insertions, 0 deletions
diff --git a/board/Marvell/guruplug/Kconfig b/board/Marvell/guruplug/Kconfig new file mode 100644 index 0000000000..fce8562187 --- /dev/null +++ b/board/Marvell/guruplug/Kconfig @@ -0,0 +1,23 @@ +if TARGET_GURUPLUG + +config SYS_CPU + string + default "arm926ejs" + +config SYS_BOARD + string + default "guruplug" + +config SYS_VENDOR + string + default "Marvell" + +config SYS_SOC + string + default "kirkwood" + +config SYS_CONFIG_NAME + string + default "guruplug" + +endif diff --git a/board/Marvell/guruplug/MAINTAINERS b/board/Marvell/guruplug/MAINTAINERS new file mode 100644 index 0000000000..b5d0734831 --- /dev/null +++ b/board/Marvell/guruplug/MAINTAINERS @@ -0,0 +1,6 @@ +GURUPLUG BOARD +M: Siddarth Gore <gores@marvell.com> +S: Maintained +F: board/Marvell/guruplug/ +F: include/configs/guruplug.h +F: configs/guruplug_defconfig |