Masahiro Yamada (5): ARM: uniphier: set DTB file name to fdt_file environment ARM: uniphier: drop fdt_file from CONFIG_EXTRA_ENV_SETTINGS ARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig ARM: uniphier: support ProXstream2, PH1-LD6b boards in single defconfig ARM: uniphier: rename defconfig files
MAINTAINERS | 2 +- arch/arm/mach-uniphier/board_late_init.c | 35 +++++++++++++++++++++ configs/ph1_sld8_defconfig | 30 ------------------ ...1_ld4_defconfig => uniphier_ld4_sld8_defconfig} | 1 + ...{ph1_pro4_defconfig => uniphier_pro4_defconfig} | 0 ...{ph1_pro5_defconfig => uniphier_pro5_defconfig} | 0 ...ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} | 3 +- ...{ph1_sld3_defconfig => uniphier_sld3_defconfig} | 0 doc/README.uniphier | 36 ++++++++++++---------- include/configs/uniphier.h | 1 - 10 files changed, 59 insertions(+), 49 deletions(-) delete mode 100644 configs/ph1_sld8_defconfig rename configs/{ph1_ld4_defconfig => uniphier_ld4_sld8_defconfig} (95%) rename configs/{ph1_pro4_defconfig => uniphier_pro4_defconfig} (100%) rename configs/{ph1_pro5_defconfig => uniphier_pro5_defconfig} (100%) rename configs/{ph1_ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} (88%) rename configs/{ph1_sld3_defconfig => uniphier_sld3_defconfig} (100%)