diff --git a/arch/m32r/m32104ut/defconfig.m32104ut b/arch/m32r/configs/m32104ut_defconfig
similarity index 100%
rename from arch/m32r/m32104ut/defconfig.m32104ut
rename to arch/m32r/configs/m32104ut_defconfig
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.smp b/arch/m32r/configs/m32700ut.smp_defconfig
similarity index 100%
rename from arch/m32r/m32700ut/defconfig.m32700ut.smp
rename to arch/m32r/configs/m32700ut.smp_defconfig
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.up b/arch/m32r/configs/m32700ut.up_defconfig
similarity index 100%
rename from arch/m32r/m32700ut/defconfig.m32700ut.up
rename to arch/m32r/configs/m32700ut.up_defconfig
diff --git a/arch/m32r/mappi/defconfig.nommu b/arch/m32r/configs/mappi.nommu_defconfig
similarity index 100%
rename from arch/m32r/mappi/defconfig.nommu
rename to arch/m32r/configs/mappi.nommu_defconfig
diff --git a/arch/m32r/mappi/defconfig.smp b/arch/m32r/configs/mappi.smp_defconfig
similarity index 100%
rename from arch/m32r/mappi/defconfig.smp
rename to arch/m32r/configs/mappi.smp_defconfig
diff --git a/arch/m32r/mappi/defconfig.up b/arch/m32r/configs/mappi.up_defconfig
similarity index 100%
rename from arch/m32r/mappi/defconfig.up
rename to arch/m32r/configs/mappi.up_defconfig
diff --git a/arch/m32r/mappi2/defconfig.opsp b/arch/m32r/configs/mappi2.opsp_defconfig
similarity index 100%
rename from arch/m32r/mappi2/defconfig.opsp
rename to arch/m32r/configs/mappi2.opsp_defconfig
diff --git a/arch/m32r/mappi2/defconfig.vdec2 b/arch/m32r/configs/mappi2.vdec2_defconfig
similarity index 100%
rename from arch/m32r/mappi2/defconfig.vdec2
rename to arch/m32r/configs/mappi2.vdec2_defconfig
diff --git a/arch/m32r/mappi3/defconfig.smp b/arch/m32r/configs/mappi3.smp_defconfig
similarity index 100%
rename from arch/m32r/mappi3/defconfig.smp
rename to arch/m32r/configs/mappi3.smp_defconfig
diff --git a/arch/m32r/oaks32r/defconfig.nommu b/arch/m32r/configs/oaks32r_defconfig
similarity index 100%
rename from arch/m32r/oaks32r/defconfig.nommu
rename to arch/m32r/configs/oaks32r_defconfig
diff --git a/arch/m32r/opsput/defconfig.opsput b/arch/m32r/configs/opsput_defconfig
similarity index 100%
rename from arch/m32r/opsput/defconfig.opsput
rename to arch/m32r/configs/opsput_defconfig