diff options
author | Stefano Babic | 2014-08-11 10:21:03 +0200 |
---|---|---|
committer | Stefano Babic | 2014-08-11 10:21:03 +0200 |
commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
tree | de701f5c90b7373966412d566b5c00d3837954bc /board/ifm | |
parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
parent | 1899fac925eda817e12234aef3d01d354788662e (diff) |
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/ifm')
-rw-r--r-- | board/ifm/ac14xx/Kconfig | 15 | ||||
-rw-r--r-- | board/ifm/ac14xx/MAINTAINERS | 6 | ||||
-rw-r--r-- | board/ifm/o2dnt2/Kconfig | 95 | ||||
-rw-r--r-- | board/ifm/o2dnt2/MAINTAINERS | 20 |
4 files changed, 136 insertions, 0 deletions
diff --git a/board/ifm/ac14xx/Kconfig b/board/ifm/ac14xx/Kconfig new file mode 100644 index 00000000000..0772d57b757 --- /dev/null +++ b/board/ifm/ac14xx/Kconfig @@ -0,0 +1,15 @@ +if TARGET_AC14XX + +config SYS_BOARD + string + default "ac14xx" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "ac14xx" + +endif diff --git a/board/ifm/ac14xx/MAINTAINERS b/board/ifm/ac14xx/MAINTAINERS new file mode 100644 index 00000000000..8fd74e516e3 --- /dev/null +++ b/board/ifm/ac14xx/MAINTAINERS @@ -0,0 +1,6 @@ +AC14XX BOARD +M: Anatolij Gustschin <agust@denx.de> +S: Maintained +F: board/ifm/ac14xx/ +F: include/configs/ac14xx.h +F: configs/ac14xx_defconfig diff --git a/board/ifm/o2dnt2/Kconfig b/board/ifm/o2dnt2/Kconfig new file mode 100644 index 00000000000..53e9c0f849e --- /dev/null +++ b/board/ifm/o2dnt2/Kconfig @@ -0,0 +1,95 @@ +if TARGET_O2D + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o2d" + +endif + +if TARGET_O2D300 + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o2d300" + +endif + +if TARGET_O2DNT2 + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o2dnt2" + +endif + +if TARGET_O2I + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o2i" + +endif + +if TARGET_O2MNT + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o2mnt" + +endif + +if TARGET_O3DNT + +config SYS_BOARD + string + default "o2dnt2" + +config SYS_VENDOR + string + default "ifm" + +config SYS_CONFIG_NAME + string + default "o3dnt" + +endif diff --git a/board/ifm/o2dnt2/MAINTAINERS b/board/ifm/o2dnt2/MAINTAINERS new file mode 100644 index 00000000000..002f89e729b --- /dev/null +++ b/board/ifm/o2dnt2/MAINTAINERS @@ -0,0 +1,20 @@ +O2DNT2 BOARD +M: Anatolij Gustschin <agust@denx.de> +S: Maintained +F: board/ifm/o2dnt2/ +F: include/configs/o2d.h +F: configs/O2D_defconfig +F: include/configs/o2d300.h +F: configs/O2D300_defconfig +F: include/configs/o2dnt2.h +F: configs/O2DNT2_defconfig +F: configs/O2DNT2_RAMBOOT_defconfig +F: include/configs/o2i.h +F: configs/O2I_defconfig +F: include/configs/o2mnt.h +F: configs/O2MNT_defconfig +F: configs/O2MNT_O2M110_defconfig +F: configs/O2MNT_O2M112_defconfig +F: configs/O2MNT_O2M113_defconfig +F: include/configs/o3dnt.h +F: configs/O3DNT_defconfig |