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/manroland | |
| 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/manroland')
| -rw-r--r-- | board/manroland/hmi1001/Kconfig | 15 | ||||
| -rw-r--r-- | board/manroland/hmi1001/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/manroland/mucmc52/Kconfig | 15 | ||||
| -rw-r--r-- | board/manroland/mucmc52/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/manroland/uc100/Kconfig | 15 | ||||
| -rw-r--r-- | board/manroland/uc100/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/manroland/uc101/Kconfig | 15 | ||||
| -rw-r--r-- | board/manroland/uc101/MAINTAINERS | 6 |
8 files changed, 84 insertions, 0 deletions
diff --git a/board/manroland/hmi1001/Kconfig b/board/manroland/hmi1001/Kconfig new file mode 100644 index 0000000..2f576dd --- /dev/null +++ b/board/manroland/hmi1001/Kconfig @@ -0,0 +1,15 @@ +if TARGET_HMI1001 + +config SYS_BOARD + string + default "hmi1001" + +config SYS_VENDOR + string + default "manroland" + +config SYS_CONFIG_NAME + string + default "hmi1001" + +endif diff --git a/board/manroland/hmi1001/MAINTAINERS b/board/manroland/hmi1001/MAINTAINERS new file mode 100644 index 0000000..bdfdc01 --- /dev/null +++ b/board/manroland/hmi1001/MAINTAINERS @@ -0,0 +1,6 @@ +HMI1001 BOARD +M: - +S: Maintained +F: board/manroland/hmi1001/ +F: include/configs/hmi1001.h +F: configs/hmi1001_defconfig diff --git a/board/manroland/mucmc52/Kconfig b/board/manroland/mucmc52/Kconfig new file mode 100644 index 0000000..4be0722 --- /dev/null +++ b/board/manroland/mucmc52/Kconfig @@ -0,0 +1,15 @@ +if TARGET_MUCMC52 + +config SYS_BOARD + string + default "mucmc52" + +config SYS_VENDOR + string + default "manroland" + +config SYS_CONFIG_NAME + string + default "mucmc52" + +endif diff --git a/board/manroland/mucmc52/MAINTAINERS b/board/manroland/mucmc52/MAINTAINERS new file mode 100644 index 0000000..45a2764 --- /dev/null +++ b/board/manroland/mucmc52/MAINTAINERS @@ -0,0 +1,6 @@ +MUCMC52 BOARD +M: Heiko Schocher <hs@denx.de> +S: Maintained +F: board/manroland/mucmc52/ +F: include/configs/mucmc52.h +F: configs/mucmc52_defconfig diff --git a/board/manroland/uc100/Kconfig b/board/manroland/uc100/Kconfig new file mode 100644 index 0000000..a41a780 --- /dev/null +++ b/board/manroland/uc100/Kconfig @@ -0,0 +1,15 @@ +if TARGET_UC100 + +config SYS_BOARD + string + default "uc100" + +config SYS_VENDOR + string + default "manroland" + +config SYS_CONFIG_NAME + string + default "uc100" + +endif diff --git a/board/manroland/uc100/MAINTAINERS b/board/manroland/uc100/MAINTAINERS new file mode 100644 index 0000000..260471c --- /dev/null +++ b/board/manroland/uc100/MAINTAINERS @@ -0,0 +1,6 @@ +UC100 BOARD +M: Stefan Roese <sr@denx.de> +S: Maintained +F: board/manroland/uc100/ +F: include/configs/uc100.h +F: configs/uc100_defconfig diff --git a/board/manroland/uc101/Kconfig b/board/manroland/uc101/Kconfig new file mode 100644 index 0000000..07cfcc6 --- /dev/null +++ b/board/manroland/uc101/Kconfig @@ -0,0 +1,15 @@ +if TARGET_UC101 + +config SYS_BOARD + string + default "uc101" + +config SYS_VENDOR + string + default "manroland" + +config SYS_CONFIG_NAME + string + default "uc101" + +endif diff --git a/board/manroland/uc101/MAINTAINERS b/board/manroland/uc101/MAINTAINERS new file mode 100644 index 0000000..0fc7b85 --- /dev/null +++ b/board/manroland/uc101/MAINTAINERS @@ -0,0 +1,6 @@ +UC101 BOARD +M: Heiko Schocher <hs@denx.de> +S: Maintained +F: board/manroland/uc101/ +F: include/configs/uc101.h +F: configs/uc101_defconfig |