diff options
author | Tom Rini <trini@konsulko.com> | 2017-03-19 14:49:26 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-03-19 15:13:38 -0400 |
commit | 02ccab1908c405fe1449457d4a0d343784a30acb (patch) | |
tree | 3a5d41abff96a3af22587ace67713d5c0165b097 /board/phytec/pcm052/Kconfig | |
parent | f40574e2d78c96a3818c4fa2379382d924866a6e (diff) | |
parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
Diffstat (limited to 'board/phytec/pcm052/Kconfig')
-rw-r--r-- | board/phytec/pcm052/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/board/phytec/pcm052/Kconfig b/board/phytec/pcm052/Kconfig index 212f994294..4fde21c586 100644 --- a/board/phytec/pcm052/Kconfig +++ b/board/phytec/pcm052/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "phytec" -config SYS_SOC - default "vf610" - config SYS_CONFIG_NAME default "pcm052" @@ -26,9 +23,6 @@ config SYS_BOARD config SYS_VENDOR default "phytec" -config SYS_SOC - default "vf610" - config SYS_CONFIG_NAME default "bk4r1" |