From e1a58ae2d6b65f0c2fdc18d10b382e729f218948 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 15 Jan 2019 01:26:16 +0000 Subject: [PATCH] powerpc: collapse powerpc64le into powerpc, only ppc64le exists now and only a few options in the subdir --- configs/config_generation | 4 ++-- .../powerpc/{powerpc64le => }/CONFIG_CHECKPOINT_RESTORE | 0 .../generic/powerpc/{powerpc64le => }/CONFIG_CPU_BIG_ENDIAN | 0 .../powerpc/{powerpc64le => }/CONFIG_CPU_LITTLE_ENDIAN | 0 .../fedora/generic/powerpc/{powerpc64le => }/CONFIG_FSI_OCC | 0 .../generic/powerpc/{powerpc64le => }/CONFIG_FSI_SBEFIFO | 0 .../generic/powerpc/{powerpc64le => }/CONFIG_GENERIC_PHY | 0 .../fedora/generic/powerpc/{powerpc64le => }/CONFIG_I2C_MUX | 0 .../fedora/generic/powerpc/{powerpc64le => }/CONFIG_MFD_CORE | 0 .../generic/powerpc/{powerpc64le => }/CONFIG_POWER8_CPU | 0 .../powerpc/{powerpc64le => }/CONFIG_SENSORS_OCC_P8_I2C | 0 .../powerpc/{powerpc64le => }/CONFIG_SENSORS_OCC_P9_SBE | 0 .../generic/powerpc/{powerpc64le => }/CONFIG_SERIAL_CORE | 0 configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_CPU | 1 - 14 files changed, 2 insertions(+), 3 deletions(-) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_CHECKPOINT_RESTORE (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_CPU_BIG_ENDIAN (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_CPU_LITTLE_ENDIAN (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_FSI_OCC (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_FSI_SBEFIFO (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_GENERIC_PHY (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_I2C_MUX (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_MFD_CORE (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_POWER8_CPU (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_SENSORS_OCC_P8_I2C (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_SENSORS_OCC_P9_SBE (100%) rename configs/fedora/generic/powerpc/{powerpc64le => }/CONFIG_SERIAL_CORE (100%) delete mode 100644 configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_CPU diff --git a/configs/config_generation b/configs/config_generation index 7ed73cf9c..97683c517 100644 --- a/configs/config_generation +++ b/configs/config_generation @@ -17,8 +17,8 @@ i686=generic:generic-x86:generic-x86-i686 i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86 # ppc64le -ppc64le=generic:generic-powerpc:generic-powerpc-powerpc64le -ppc64le-debug=generic:generic-powerpc:generic-powerpc-powerpc64le:debug +ppc64le=generic:generic-powerpc +ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug # s390x s390x=generic:generic-s390x diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE b/configs/fedora/generic/powerpc/CONFIG_CHECKPOINT_RESTORE similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_CHECKPOINT_RESTORE rename to configs/fedora/generic/powerpc/CONFIG_CHECKPOINT_RESTORE diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_CPU_BIG_ENDIAN b/configs/fedora/generic/powerpc/CONFIG_CPU_BIG_ENDIAN similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_CPU_BIG_ENDIAN rename to configs/fedora/generic/powerpc/CONFIG_CPU_BIG_ENDIAN diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN b/configs/fedora/generic/powerpc/CONFIG_CPU_LITTLE_ENDIAN similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_CPU_LITTLE_ENDIAN rename to configs/fedora/generic/powerpc/CONFIG_CPU_LITTLE_ENDIAN diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC b/configs/fedora/generic/powerpc/CONFIG_FSI_OCC similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_OCC rename to configs/fedora/generic/powerpc/CONFIG_FSI_OCC diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO b/configs/fedora/generic/powerpc/CONFIG_FSI_SBEFIFO similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_FSI_SBEFIFO rename to configs/fedora/generic/powerpc/CONFIG_FSI_SBEFIFO diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_PHY b/configs/fedora/generic/powerpc/CONFIG_GENERIC_PHY similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_PHY rename to configs/fedora/generic/powerpc/CONFIG_GENERIC_PHY diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_I2C_MUX b/configs/fedora/generic/powerpc/CONFIG_I2C_MUX similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_I2C_MUX rename to configs/fedora/generic/powerpc/CONFIG_I2C_MUX diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_MFD_CORE b/configs/fedora/generic/powerpc/CONFIG_MFD_CORE similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_MFD_CORE rename to configs/fedora/generic/powerpc/CONFIG_MFD_CORE diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_POWER8_CPU b/configs/fedora/generic/powerpc/CONFIG_POWER8_CPU similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_POWER8_CPU rename to configs/fedora/generic/powerpc/CONFIG_POWER8_CPU diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C b/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P8_I2C similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P8_I2C rename to configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P8_I2C diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE b/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P9_SBE similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_SENSORS_OCC_P9_SBE rename to configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P9_SBE diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_SERIAL_CORE b/configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE similarity index 100% rename from configs/fedora/generic/powerpc/powerpc64le/CONFIG_SERIAL_CORE rename to configs/fedora/generic/powerpc/CONFIG_SERIAL_CORE diff --git a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_CPU b/configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_CPU deleted file mode 100644 index db96c7ae9..000000000 --- a/configs/fedora/generic/powerpc/powerpc64le/CONFIG_GENERIC_CPU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_GENERIC_CPU is not set