From aae58b954b527882fde35bd718b9f865b18eda46 Mon Sep 17 00:00:00 2001 From: Joel Fernandes Date: Sun, 11 Sep 2011 08:37:33 +0000 Subject: BeagleBoard: Remove userbutton command and use gpio command instead Remove userbutton command and do the detection in board config file using the gpio command Signed-off-by: Joel A Fernandes Signed-off-by: Jason Kridner --- include/configs/omap3_beagle.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index d3a0122..ddeb414 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -167,6 +167,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_SETEXPR /* Evaluate expressions */ +#define CONFIG_CMD_GPIO /* Enable gpio command */ #undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ @@ -280,10 +281,16 @@ "ramboot=echo Booting from ramdisk ...; " \ "run ramargs; " \ "bootm ${loadaddr}\0" \ - + "userbutton=if gpio input 173; then run userbutton_xm; " \ + "else run userbutton_nonxm; fi;\0" \ + "userbutton_xm=gpio input 4;\0" \ + "userbutton_nonxm=gpio input 7;\0" +/* "run userbutton" will return 1 (false) if is pressed and 0 (false) if not */ #define CONFIG_BOOTCOMMAND \ "if mmc rescan ${mmcdev}; then " \ - "if userbutton; then " \ + "if run userbutton; then " \ + "setenv bootenv uEnv.txt;" \ + "else " \ "setenv bootenv user.txt;" \ "fi;" \ "echo SD/MMC found on device ${mmcdev};" \ -- cgit v1.1 From 385488dc1b20e55739cfdecdce20319a60dbad44 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 2 Apr 2012 06:33:43 +0000 Subject: hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT With older toolchains we need CONFIG_SPL_LIBGENERIC_SUPPORT in order for CONFIG_SPL_NAND_SUPPORT to link. Signed-off-by: Tom Rini --- include/configs/hawkboard.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/configs') diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index 50a1c17..0859371 100644 --- a/include/configs/hawkboard.h +++ b/include/configs/hawkboard.h @@ -62,6 +62,7 @@ #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD +#define CONFIG_SPL_LIBGENERIC_SUPPORT /* for udelay and __div64_32 for NAND */ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LDSCRIPT "board/$(BOARDDIR)/u-boot-spl-hawk.lds" #define CONFIG_SPL_TEXT_BASE 0xc1080000 -- cgit v1.1 From 36f3aab2dd6e970244c555a858943747f97ab8f0 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Tue, 3 Apr 2012 00:37:03 +0000 Subject: tricorder: Add UBIFS Since kernel should be in a ubifs partition, we need UBIFS. The greater malloc size is needed for UBIFS. Signed-off-by: Bernhard Walle Squashed two commits (UBIFS enabled and malloc size increased) into one. Signed-off-by: Thomas Weber --- include/configs/tricorder.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index ba8847b..d826e19 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -71,7 +71,7 @@ /* Size of malloc() pool */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ /* Sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512 << 10)) +#define CONFIG_SYS_MALLOC_LEN (1024*1024) /* Hardware drivers */ @@ -139,7 +139,9 @@ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ -#define CONFIG_CMD_UBI /* UBIFS commands */ +#define CONFIG_CMD_UBI /* UBI commands */ +#define CONFIG_CMD_UBIFS /* UBIFS commands */ +#define CONFIG_LZO /* LZO is needed for UBIFS */ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS -- cgit v1.1 From 008ec95054c170859e7a2dfdf87ce15e2e6cd017 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Tue, 3 Apr 2012 00:37:04 +0000 Subject: tricorder: Load kernel from ubifs Signed-off-by: Bernhard Walle --- include/configs/tricorder.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index d826e19..801a24f 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -182,7 +182,8 @@ "setenv bootargs ${bootargs} " \ "omapfb.mode=lcd:${lcdmode} " \ "omapdss.def_disp=${defaultdisplay} " \ - "root=ubi0:rootfs " \ + "root=ubi0:root " \ + "ubi.mtd=4 " \ "rootfstype=ubifs " \ "${kernelopts}\0" \ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ @@ -193,9 +194,13 @@ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ + "loaduimage_ubi=mtd default; " \ + "ubi part fs; " \ + "ubifsmount root; " \ + "ubifsload ${loadaddr} /boot/uImage\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ - "nand read ${loadaddr} 280000 400000; " \ + "run loaduimage_ubi; " \ "bootm ${loadaddr}\0" \ "autoboot=if mmc rescan ${mmcdev}; then " \ "if run loadbootscript; then " \ -- cgit v1.1 From 4d422fe2dce90d1052c9ab133fe0059ff2e92394 Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Sun, 4 Mar 2012 11:47:38 +0000 Subject: i.MX6: implement enable_caches() disabled by default until drivers are fixed Signed-off-by: Eric Nelson Acked-by: Marek Vasut --- include/configs/mx6qarm2.h | 2 ++ include/configs/mx6qsabrelite.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'include/configs') diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 0962d3c..e83aec6 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -169,4 +169,6 @@ #define CONFIG_OF_LIBFDT +#define CONFIG_SYS_DCACHE_OFF + #endif /* __CONFIG_H */ diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 8bc8a83..d3b31fe 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -212,4 +212,6 @@ #define CONFIG_OF_LIBFDT +#define CONFIG_SYS_DCACHE_OFF + #endif /* __CONFIG_H */ -- cgit v1.1 From 66b4170b294e84d1b8cdf8f1334703baeb9d8751 Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Sun, 4 Mar 2012 11:47:39 +0000 Subject: i.MX6: mx6qsabrelite: add cache commands if cache is enabled Signed-off-by: Eric Nelson Acked-by: Marek Vasut --- include/configs/mx6qsabrelite.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/configs') diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index d3b31fe..c851559 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -214,4 +214,8 @@ #define CONFIG_SYS_DCACHE_OFF +#ifndef CONFIG_SYS_DCACHE_OFF +#define CONFIG_CMD_CACHE +#endif + #endif /* __CONFIG_H */ -- cgit v1.1 From f4ac6cb6af107ce62754dd3bfc7ff31a92e7e2c8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 28 Mar 2012 09:45:26 +0000 Subject: mx6qsabrelite: Fix the serial console port On mx6qsabrelite the console is ttymxc1. Signed-off-by: Fabio Estevam --- include/configs/mx6qsabrelite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index c851559..f52c3c7 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -116,7 +116,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ - "console=ttymxc3\0" \ + "console=ttymxc1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "mmcdev=0\0" \ -- cgit v1.1 From 81b1c9ebe1f5a4e36eaccc0e3732c3fbf76f9807 Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Sun, 1 Apr 2012 03:23:00 +0000 Subject: mx35: flea3: fix when cache functions are linked Signed-off-by: Stefano Babic --- include/configs/flea3.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs') diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 649e272..f046a58 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -34,6 +34,7 @@ #define CONFIG_MX35_HCLK_FREQ 24000000 #define CONFIG_SYS_DCACHE_OFF +#define CONFIG_SYS_CACHELINE_SIZE 32 #define CONFIG_DISPLAY_CPUINFO @@ -98,6 +99,7 @@ #define CONFIG_BOOTP_DNS #define CONFIG_CMD_NAND +#define CONFIG_CMD_CACHE #define CONFIG_CMD_I2C #define CONFIG_CMD_SPI -- cgit v1.1 From 0792a36efbde78681faebcbe1326adc4524fbcaa Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Sun, 1 Apr 2012 03:23:01 +0000 Subject: mx35: mx35pdk: fix when cache functions are linked Signed-off-by: Stefano Babic --- include/configs/mx35pdk.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs') diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 0c62b9f..1e03639 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -38,6 +38,7 @@ /* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 +#define CONFIG_SYS_CACHELINE_SIZE 32 #define CONFIG_SYS_64BIT_VSPRINTF @@ -106,6 +107,7 @@ #define CONFIG_BOOTP_DNS #define CONFIG_CMD_NAND +#define CONFIG_CMD_CACHE #define CONFIG_CMD_I2C #define CONFIG_CMD_SPI -- cgit v1.1 From 9ed5dfa852e7b976ba7656713e2de37816cf9fea Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 1 Apr 2012 18:21:34 +0000 Subject: i.MX28: Fix initial stack pointer position The patch: m28evk: Use GENERATED_GBL_DATA_SIZE commit 1084606c972ea5f1d89f69bdbd978b867d0ee521 introduced usage of GENERATED_GBL_DATA_SIZE and calculation of initial stack pointer position defived from that. Due to a small typo, the SP position moved to 0x21f80, which is past the SRAM area. This didn't manifest on the real hardware as the SRAM repeats there (address bits in the CPU being ignored). Though this was caught in QEMU, where it crashed the emulator. Signed-off-by: Marek Vasut Cc: Stefano Babic Cc: Fabio Estevam Tested-by: Fabio Estevam --- include/configs/m28evk.h | 2 +- include/configs/mx28evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 8b83180..4df013c 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -93,7 +93,7 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Point initial SP in SRAM so SPL can use it too. */ -#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000 +#define CONFIG_SYS_INIT_RAM_ADDR 0x00000000 #define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024) #define CONFIG_SYS_INIT_SP_OFFSET \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 705fdab..02f3366 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -81,7 +81,7 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Point initial SP in SRAM so SPL can use it too. */ -#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000 +#define CONFIG_SYS_INIT_RAM_ADDR 0x00000000 #define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024) #define CONFIG_SYS_INIT_SP_OFFSET \ -- cgit v1.1 From e87ca8c049849b12f66c98227cd5228bde9769eb Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 8 Apr 2012 17:09:06 +0000 Subject: M28: Pull out CONFIG_APBH_DMA so it's always enabled The ABPH DMA is now used also by the SD card. Therefore it has to be enabled even if NAND is disabled. Signed-off-by: Marek Vasut Cc: Stefano Babic Cc: Wolfgang Denk Cc: Detlev Zundel Cc: Fabio Estevam --- include/configs/m28evk.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 4df013c..012381a 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -146,12 +146,16 @@ #endif /* + * APBH DMA + */ +#define CONFIG_APBH_DMA + +/* * NAND */ #define CONFIG_ENV_SIZE (16 * 1024) #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_MXS -#define CONFIG_APBH_DMA #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x60000000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE -- cgit v1.1 From 2f002eceae44c21656b7f596624c636157ffdf1c Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Mon, 9 Apr 2012 13:29:06 +0200 Subject: MX35: mx35pdk: wrong board revision The board revision is detected accessing to the pmic, that is not available before relocation (I2C). This generates the following error: CPU: Freescale i.MX35 rev 2.0 at 532 MHz. Reset cause: WDOG = 7 is invalid. Should be less than 0 Board: MX35 PDK 1.0 The revision number is wrong, as a default value is printed (tested on a mx35pdk Rev. 2.0). Move the output in the board_late_init(), when pmic can be accessed. Signed-off-by: Stefano Babic --- include/configs/mx35pdk.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 1e03639..de4b954 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -34,7 +34,6 @@ #define CONFIG_MX35_HCLK_FREQ 24000000 #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO /* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 -- cgit v1.1