diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-01-17 01:37:36 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-17 17:08:32 -0600 |
| commit | 6cdc07080933ce16ab966892dcc8f802b7d06481 (patch) | |
| tree | c63c1a526364471861c2f124f15a35ee6947514c /debian.linaro | |
| parent | d62d4eeabc053ff30a28e3d17cc466a80e705f96 (diff) | |
LINARO: update configs
Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'debian.linaro')
9 files changed, 3 insertions, 8 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51 index 1e8db175324..5ef4682c1bc 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-mx51 +++ b/debian.linaro/config/armel/config.flavour.linaro-mx51 @@ -10,7 +10,6 @@ CONFIG_ARM_THUMBEE=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_CMDLINE="" -CONFIG_DEBUG_IMX51_UART=y # CONFIG_DEBUG_LL_UART_NONE is not set # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_DRM is not set diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap index 1f10c6455f1..8747c31d265 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-omap +++ b/debian.linaro/config/armel/config.flavour.linaro-omap @@ -11,7 +11,6 @@ CONFIG_ARM_THUMBEE=y # CONFIG_AUTO_ZRELADDR is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" -# CONFIG_DEBUG_IMX51_UART is not set CONFIG_DEBUG_LL_UART_NONE=y CONFIG_DISPLAY_SUPPORT=y CONFIG_DRM=y diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress index d77de18ece7..20fb81fd9dd 100644 --- a/debian.linaro/config/armel/config.flavour.linaro-vexpress +++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress @@ -11,7 +11,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_AUTO_ZRELADDR is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -# CONFIG_DEBUG_IMX51_UART is not set CONFIG_DEBUG_LL_UART_NONE=y # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_DRM is not set diff --git a/debian.linaro/config/armhf/config.common.armhf b/debian.linaro/config/armhf/config.common.armhf index 1903a346e48..6e30920b78b 100644 --- a/debian.linaro/config/armhf/config.common.armhf +++ b/debian.linaro/config/armhf/config.common.armhf @@ -1,3 +1,3 @@ # -# Config options for config.common.armel automatically generated by splitconfig.pl +# Config options for config.common.armhf automatically generated by splitconfig.pl # diff --git a/debian.linaro/config/armhf/config.flavour.linaro-mx51 b/debian.linaro/config/armhf/config.flavour.linaro-mx51 index 1e8db175324..5ef4682c1bc 100644 --- a/debian.linaro/config/armhf/config.flavour.linaro-mx51 +++ b/debian.linaro/config/armhf/config.flavour.linaro-mx51 @@ -10,7 +10,6 @@ CONFIG_ARM_THUMBEE=y CONFIG_AUTO_ZRELADDR=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_CMDLINE="" -CONFIG_DEBUG_IMX51_UART=y # CONFIG_DEBUG_LL_UART_NONE is not set # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_DRM is not set diff --git a/debian.linaro/config/armhf/config.flavour.linaro-omap b/debian.linaro/config/armhf/config.flavour.linaro-omap index 1f10c6455f1..8747c31d265 100644 --- a/debian.linaro/config/armhf/config.flavour.linaro-omap +++ b/debian.linaro/config/armhf/config.flavour.linaro-omap @@ -11,7 +11,6 @@ CONFIG_ARM_THUMBEE=y # CONFIG_AUTO_ZRELADDR is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" -# CONFIG_DEBUG_IMX51_UART is not set CONFIG_DEBUG_LL_UART_NONE=y CONFIG_DISPLAY_SUPPORT=y CONFIG_DRM=y diff --git a/debian.linaro/config/armhf/config.flavour.linaro-vexpress b/debian.linaro/config/armhf/config.flavour.linaro-vexpress index d77de18ece7..20fb81fd9dd 100644 --- a/debian.linaro/config/armhf/config.flavour.linaro-vexpress +++ b/debian.linaro/config/armhf/config.flavour.linaro-vexpress @@ -11,7 +11,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_AUTO_ZRELADDR is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" -# CONFIG_DEBUG_IMX51_UART is not set CONFIG_DEBUG_LL_UART_NONE=y # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_DRM is not set diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index 3c57a3a8a2e..5a7ba5d0782 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -413,6 +413,7 @@ CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_ICEDCC is not set # CONFIG_DEBUG_IMX50_IMX53_UART is not set +CONFIG_DEBUG_IMX51_UART=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_DEBUG_KERNEL=y diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce index 9fefd0c859e..8ded7fc1228 100644 --- a/debian.linaro/config/enforce +++ b/debian.linaro/config/enforce @@ -20,7 +20,7 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y # For architectures which support this option ensure it is disabled. !exists CONFIG_COMPAT_VDSO | value CONFIG_COMPAT_VDSO n # Default to 32768 for armel, 65536 for everything else. -( arch armel & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \ +( arch armel armhf & value CONFIG_DEFAULT_MMAP_MIN_ADDR 32768 ) | \ ( value CONFIG_DEFAULT_MMAP_MIN_ADDR 65536) # CONFIG_USB_DEVICE_FS breaks udev USB firmware loading and is deprecated |