From a946a810921258f93a3775935fd433198cba5004 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 9 Oct 2013 13:21:27 -0600 Subject: [PATCH] SAMA5 LCDC: Corrections from first debug sessions. Still a way to go --- configs/sama5d3x-ek/include/board.h | 1 - configs/sama5d3x-ek/nx/defconfig | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/configs/sama5d3x-ek/include/board.h b/configs/sama5d3x-ek/include/board.h index 57471a0fb55..e9e63961326 100644 --- a/configs/sama5d3x-ek/include/board.h +++ b/configs/sama5d3x-ek/include/board.h @@ -124,7 +124,6 @@ #define BOARD_BLUE_BIT (1 << BOARD_BLUE) #define BOARD_RED_BIT (1 << BOARD_RED) - /* These LEDs are not used by the board port unless CONFIG_ARCH_LEDS is * defined. In that case, the usage by the board port is defined in * include/board.h and src/sam_leds.c. The LEDs are used to encode OS-related diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index 660f3892ad0..763f398e116 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -162,7 +162,7 @@ CONFIG_SAMA5_LCDC=y # CONFIG_SAMA5_TRNG is not set # CONFIG_SAMA5_ARM is not set # CONFIG_SAMA5_FUSE is not set -# CONFIG_SAMA5_MPDDRC is not set +CONFIG_SAMA5_MPDDRC=y # CONFIG_SAMA5_PIO_IRQ is not set CONFIG_SAMA5_HAVE_LCDC=y @@ -171,7 +171,7 @@ CONFIG_SAMA5_HAVE_LCDC=y # CONFIG_SAMA5_LCDC_BACKLIGHT=y CONFIG_SAMA5_LCDC_DEFBACKLIGHT=0xf0 -CONFIG_SAMA5_LCDC_BACKCOLOR=0x0 +CONFIG_SAMA5_LCDC_BACKCOLOR=0x007b68ee CONFIG_SAMA5_LCDC_FBALLOCATED=y # CONFIG_SAMA5_LCDC_FBFIXED is not set # CONFIG_SAMA5_LCDC_FBPREALLOCATED is not set @@ -179,8 +179,6 @@ CONFIG_SAMA5_LCDC_FBALLOCATED=y # # Base layer configuration # -CONFIG_SAMA5_LCDC_BASE_HEIGHT=480 -CONFIG_SAMA5_LCDC_BASE_WIDTH=800 CONFIG_SAMA5_LCDC_BASE_ROT0=y # CONFIG_SAMA5_LCDC_BASE_ROT90 is not set # CONFIG_SAMA5_LCDC_BASE_ROT180 is not set @@ -205,6 +203,10 @@ CONFIG_SAMA5_HAVE_GMAC=y # # External Memory Configuration # +CONFIG_SAMA5_DDRCS=y +CONFIG_SAMA5_DDRCS_SIZE=268435456 +# CONFIG_SAMA5_DDRCS_LPDDR1 is not set +CONFIG_SAMA5_DDRCS_LPDDR2=y CONFIG_SAMA5_EBICS0=y CONFIG_SAMA5_EBICS0_SIZE=134217728 # CONFIG_SAMA5_EBICS0_SRAM is not set @@ -219,12 +221,14 @@ CONFIG_SAMA5_EBICS0_NOR=y # CONFIG_SAMA5_EBICS2 is not set # CONFIG_SAMA5_EBICS3 is not set # CONFIG_SAMA5_BOOT_ISRAM is not set +# CONFIG_SAMA5_BOOT_SDRAM is not set CONFIG_SAMA5_BOOT_CS0FLASH=y # # Heap Configuration # CONFIG_SAMA5_ISRAM_HEAP=y +CONFIG_SAMA5_DDRCS_HEAP=y # # Architecture Options @@ -288,6 +292,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y # # Board-Specific Options # +CONFIG_SAMA5_MT47H128M16RT=y +# CONFIG_SAMA5_MT47H64M16HR is not set # # RTOS Features @@ -458,8 +464,8 @@ CONFIG_NX_DISABLE_2BPP=y CONFIG_NX_DISABLE_4BPP=y CONFIG_NX_DISABLE_8BPP=y CONFIG_NX_DISABLE_16BPP=y -CONFIG_NX_DISABLE_24BPP=y -# CONFIG_NX_DISABLE_32BPP is not set +# CONFIG_NX_DISABLE_24BPP is not set +CONFIG_NX_DISABLE_32BPP=y CONFIG_NX_PACKEDMSFIRST=y # @@ -509,7 +515,7 @@ CONFIG_NXFONT_SERIF22X28B=y # # CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set -CONFIG_MM_REGIONS=1 +CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set #