[PATCH 1/4] UBUNTU: [Config] armhf: SOC_AM33XX=y

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/armhf/config.common.armhf         | 1 -
 debian.master/config/armhf/config.flavour.generic      | 2 ++
 debian.master/config/armhf/config.flavour.generic-lpae | 2 ++
 debian.master/config/config.common.ubuntu              | 7 ++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5b2083a..5276c8c 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -83,7 +83,6 @@ CONFIG_FIREWIRE_NOSY=m
 # CONFIG_FMAN_P1023 is not set
 CONFIG_FMAN_P3040_P4080_P5020=y
 CONFIG_FONTS=y
-CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FRAME_WARN=1024
 CONFIG_FSL_FMAN=y
 # CONFIG_FUNCTION_TRACER is not set
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 44b9b8d..00baa39 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -13,10 +13,12 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_COMPACTION is not set
+CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_TWL6040=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SOC_AM33XX=y
 CONFIG_USB_INVENTRA_DMA=y
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 0e3d228..c8837a8 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -13,10 +13,12 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARM_HIGHBANK_CPUIDLE=y
 CONFIG_ARM_LPAE=y
 CONFIG_COMPACTION=y
+CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_TWL6040=m
 CONFIG_HUGETLB_PAGE=y
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_SOC_AM33XX is not set
 # CONFIG_USB_INVENTRA_DMA is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fb59207..47349b9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2006,6 +2006,7 @@ CONFIG_FB_CONTROL=y
 CONFIG_FB_CT65550=y
 CONFIG_FB_CYBER2000=m
 CONFIG_FB_CYBER2000_DDC=y
+# CONFIG_FB_DA8XX is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
@@ -5102,6 +5103,8 @@ CONFIG_PWM_PCA9685=m
 CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=m
+# CONFIG_PWM_TIECAP is not set
+# CONFIG_PWM_TIEHRPWM is not set
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_QE_USB=y
@@ -5385,6 +5388,7 @@ CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MOXART=m
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_MXC is not set
+# CONFIG_RTC_DRV_OMAP is not set
 CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_PCF2123=m
@@ -6003,6 +6007,7 @@ CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_CTXFI=m
 CONFIG_SND_DARLA20=m
 CONFIG_SND_DARLA24=m
+# CONFIG_SND_DAVINCI_SOC is not set
 CONFIG_SND_DEBUG=y
 # CONFIG_SND_DEBUG_VERBOSE is not set
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -6230,7 +6235,6 @@ CONFIG_SND_VX_LIB=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_WSS_LIB=m
 CONFIG_SND_YMFPCI=m
-# CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
 CONFIG_SOC_BUS=y
 CONFIG_SOC_CAMERA=m
@@ -6516,6 +6520,7 @@ CONFIG_TIPC_PORTS=8191
 CONFIG_TI_ADC081C=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TI_CPPI41=m
+# CONFIG_TI_CPSW is not set
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_DAVINCI_EMAC=m
-- 
1.9.0