[U-Boot-Users] [PATCH 3/3] MX31ADS environment variable update, spi and rtc support
Update MX31ADS default environment to better match the flash layout and the memory map, support SPI and RTC.
Signed-off-by: Guennadi Liakhovetski lg@denx.de
---
diff --git a/board/mx31ads/mx31ads.c b/board/mx31ads/mx31ads.c index 5a7d8c9..a75cc2d 100644 --- a/board/mx31ads/mx31ads.c +++ b/board/mx31ads/mx31ads.c @@ -57,6 +57,18 @@ int board_init (void) mx31_gpio_mux(MUX_RTS1__UART1_RTS_B); mx31_gpio_mux(MUX_RTS1__UART1_CTS_B);
+ /* SPI2 */ + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS2); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SCLK); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SPI_RDY); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_MOSI); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_MISO); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS0); + mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS1); + + /* start SPI2 clock */ + __REG(CCM_CGR2) = __REG(CCM_CGR2) | (3 << 4); + /* PBC setup */ /* Enable UART transceivers also reset the Ethernet/external UART */ readw(CS4_BASE + 4); diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 78e2545..5286e1f 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -51,7 +51,7 @@ * Size of malloc() pool */ #define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128 * 1024) -#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/* * Hardware drivers @@ -60,6 +60,12 @@ #define CONFIG_MX31_UART 1 #define CFG_MX31_UART1 1
+#define CONFIG_HARD_SPI 1 +#define CONFIG_MXC_SPI 1 +#define CONFIG_MXC_SPI_IFACE 1 /* Default SPI interface number */ + +#define CONFIG_RTC_MC13783 1 + /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 @@ -73,20 +79,33 @@ #include <config_cmd_default.h>
#define CONFIG_CMD_PING +#define CONFIG_CMD_SPI +#define CONFIG_CMD_DATE
#define CONFIG_BOOTDELAY 3
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_IPADDR 192.168.23.168 #define CONFIG_SERVERIP 192.168.23.2 - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ - "bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0" \ - "bootcmd=run bootcmd_net\0" \ - "bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; tftpboot 0x80000000 uImage-mx31; bootm\0" \ - "prg_uboot=tftpboot 0x80000000 u-boot-mx31ads.bin; protect off 0xa0000000 0xa001ffff; erase 0xa0000000 0xa001ffff; cp.b 0x80000000 0xa0000000 $(filesize)\0" - +#define CONFIG_LOADADDR (CSD0_BASE + 0x800000) /* loadaddr env var */ + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "uboot_addr=0xa0000000\0" \ + "uboot=mx31ads/u-boot.bin\0" \ + "kernel=mx31ads/uImage\0" \ + "nfsroot=/opt/eldk/arm\0" \ + "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ + "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "bootcmd=run bootcmd_net\0" \ + "bootcmd_net=run bootargs_base bootargs_nfs; " \ + "tftpboot ${loadaddr} ${kernel}; bootm\0" \ + "prg_uboot=tftpboot ${loadaddr} ${uboot}; " \ + "protect off ${uboot_addr} 0xa003ffff; " \ + "erase ${uboot_addr} 0xa003ffff; " \ + "cp.b ${loadaddr} ${uboot_addr} ${filesize}; " \ + "setenv filesize; saveenv\0"
#define CONFIG_DRIVER_CS8900 1 #define CS8900_BASE 0xb4020300 @@ -120,7 +139,7 @@
#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */
-#define CFG_LOAD_ADDR CSD0_BASE /* default load address */ +#define CFG_LOAD_ADDR CONFIG_LOADADDR
#define CFG_HZ 32000
In message Pine.LNX.4.64.0804151330040.5159@axis700.grange you wrote:
Update MX31ADS default environment to better match the flash layout and the memory map, support SPI and RTC.
Signed-off-by: Guennadi Liakhovetski lg@denx.de
diff --git a/board/mx31ads/mx31ads.c b/board/mx31ads/mx31ads.c
This doesn't apply at all:
Applying MX31ADS environment variable update, spi and rtc support error: board/mx31ads/mx31ads.c: does not exist in index error: include/configs/mx31ads.h: does not exist in index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... CONFLICT (delete/modify): board/mx31ads/mx31ads.c deleted in HEAD and modified in MX31ADS environment variable update, spi and rtc support. Version MX31ADS environment variable update, spi and rtc support of board/mx31ads/mx31ads.c left in tree. CONFLICT (delete/modify): include/configs/mx31ads.h deleted in HEAD and modified in MX31ADS environment variable update, spi and rtc support. Version MX31ADS environment variable update, spi and rtc support of include/configs/mx31ads.h left in tree. Failed to merge in the changes. Patch failed at 0001.
Please fix and resubmit.
Best regards,
Wolfgang Denk
On Fri, 18 Apr 2008, Wolfgang Denk wrote:
In message Pine.LNX.4.64.0804151330040.5159@axis700.grange you wrote:
Update MX31ADS default environment to better match the flash layout and the memory map, support SPI and RTC.
Signed-off-by: Guennadi Liakhovetski lg@denx.de
diff --git a/board/mx31ads/mx31ads.c b/board/mx31ads/mx31ads.c
This doesn't apply at all:
Applying MX31ADS environment variable update, spi and rtc support error: board/mx31ads/mx31ads.c: does not exist in index error: include/configs/mx31ads.h: does not exist in index
Wolfgang, please excuse me if I am missing something obvious. But the above two errors seem to suggest, that the basis mx31ads patch is missing in this tree. And an "MX31ADS ... update" shall certainly be applied on the top of that one. To be precise, this is what should be applied first:
[PATCH v3 7/7] Support for the MX31ADS evaluation board from Freescale
Could you please verify that it has indeed been applied to your tree?...
Thanks Guennadi --- Guennadi Liakhovetski, Ph.D.
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de
In message Pine.LNX.4.64.0804151330040.5159@axis700.grange you wrote:
Update MX31ADS default environment to better match the flash layout and the memory map, support SPI and RTC.
Signed-off-by: Guennadi Liakhovetski lg@denx.de
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Guennadi Liakhovetski -
Wolfgang Denk