brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-29 06:13:45 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-socfpga

Browse Source
This commit is contained in:
Tom Rini 2014-10-27 09:05:20 -04:00
commit 674ca84d11
7 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/socfpga/misc.c
View File

@ -176,7 +176,7 @@ static void socfpga_nic301_slave_ns(void)
static uint32_t iswgrp_handoff[8]; static uint32_t iswgrp_handoff[8];
int misc_init_r(void) int arch_early_init_r(void)
{ {
int i; int i;
for (i = 0; i < 8; i++) /* Cache initial SW setting regs */ for (i = 0; i < 8; i++) /* Cache initial SW setting regs */

9
arch/arm/cpu/armv7/socfpga/u-boot-spl.lds
View File

@ -42,13 +42,4 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
__bss_end = .; __bss_end = .;
} >.sdram } >.sdram
. = ALIGN(8);
__malloc_start = .;
. = . + CONFIG_SPL_MALLOC_SIZE;
__malloc_end = .;
. = . + CONFIG_SPL_STACK_SIZE;
. = ALIGN(8);
__stack_start = .;
} }

15
arch/arm/include/asm/arch-socfpga/spl.h
View File

@ -1,15 +0,0 @@
/*
* Copyright (C) 2012 Pavel Machek <pavel@denx.de>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SOCFPGA_SPL_H_
#define _SOCFPGA_SPL_H_
/* Symbols from linker script */
extern char __malloc_start, __malloc_end, __stack_start;
#define BOOT_DEVICE_RAM 1
#endif

2
arch/arm/include/asm/spl.h
View File

@ -7,7 +7,7 @@
#ifndef _ASM_SPL_H_ #ifndef _ASM_SPL_H_
#define _ASM_SPL_H_ #define _ASM_SPL_H_
#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) \ #if defined(CONFIG_OMAP) \
|| defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \
|| defined(CONFIG_EXYNOS4210) || defined(CONFIG_EXYNOS4210)
/* Platform-specific defines */ /* Platform-specific defines */

34
include/configs/socfpga_common.h
View File

@ -22,7 +22,7 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MISC_INIT_R #define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_CLOCKS #define CONFIG_CLOCKS
@ -156,6 +156,21 @@
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
/*
* USB
*/
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
#define CONFIG_USB_STORAGE
/*
* NOTE: User must define either of the following to select which
* of the two USB controllers available on SoCFPGA to use.
* The DWC2 driver doesn't support multiple USB controllers.
* #define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB0_ADDRESS
* #define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS
*/
#endif
/* /*
* U-Boot environment * U-Boot environment
*/ */
@ -167,16 +182,21 @@
/* /*
* SPL * SPL
*
* SRAM Memory layout:
*
* 0xFFFF_0000 ...... Start of SRAM
* 0xFFFF_xxxx ...... Top of stack (grows down)
* 0xFFFF_yyyy ...... Malloc area
* 0xFFFF_zzzz ...... Global Data
* 0xFFFF_FF00 ...... End of SRAM
*/ */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_RAM_DEVICE #define CONFIG_SPL_RAM_DEVICE
#define CONFIG_SPL_TEXT_BASE 0xFFFF0000 #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR
#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_INIT_SP_ADDR
#define CONFIG_SPL_STACK_SIZE (4 * 1024) #define CONFIG_SYS_SPL_MALLOC_SIZE (5 * 1024)
#define CONFIG_SPL_MALLOC_SIZE (5 * 1024) /* FIXME */
#define CONFIG_SYS_SPL_MALLOC_START ((unsigned long) (&__malloc_start))
#define CONFIG_SYS_SPL_MALLOC_SIZE (&__malloc_end - &__malloc_start)
#define CHUNKSZ_CRC32 (1 * 1024) /* FIXME: ewww */ #define CHUNKSZ_CRC32 (1 * 1024) /* FIXME: ewww */
#define CONFIG_CRC32_VERIFY #define CONFIG_CRC32_VERIFY

2
include/configs/socfpga_cyclone5.h
View File

@ -55,10 +55,8 @@
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS #define CONFIG_EMAC_BASE SOCFPGA_EMAC1_ADDRESS
#define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII #define CONFIG_PHY_INTERFACE_MODE PHY_INTERFACE_MODE_RGMII
#define CONFIG_EPHY0_PHY_ADDR 0
/* PHY */ /* PHY */
#define CONFIG_EPHY1_PHY_ADDR 4
#define CONFIG_PHY_MICREL #define CONFIG_PHY_MICREL
#define CONFIG_PHY_MICREL_KSZ9021 #define CONFIG_PHY_MICREL_KSZ9021
#define CONFIG_KSZ9021_CLK_SKEW_ENV "micrel-ksz9021-clk-skew" #define CONFIG_KSZ9021_CLK_SKEW_ENV "micrel-ksz9021-clk-skew"

16
tools/socfpgaimage.c
View File

@ -74,12 +74,12 @@ static uint16_t hdr_checksum(struct socfpga_header *header)
static void build_header(uint8_t *buf, uint8_t version, uint8_t flags, static void build_header(uint8_t *buf, uint8_t version, uint8_t flags,
uint16_t length_bytes) uint16_t length_bytes)
{ {
header.validation = htole32(VALIDATION_WORD); header.validation = cpu_to_le32(VALIDATION_WORD);
header.version = version; header.version = version;
header.flags = flags; header.flags = flags;
header.length_u32 = htole16(length_bytes/4); header.length_u32 = cpu_to_le16(length_bytes/4);
header.zero = 0; header.zero = 0;
header.checksum = htole16(hdr_checksum(&header)); header.checksum = cpu_to_le16(hdr_checksum(&header));
memcpy(buf, &header, sizeof(header)); memcpy(buf, &header, sizeof(header));
} }
@ -92,12 +92,12 @@ static int verify_header(const uint8_t *buf)
{ {
memcpy(&header, buf, sizeof(header)); memcpy(&header, buf, sizeof(header));
if (le32toh(header.validation) != VALIDATION_WORD) if (le32_to_cpu(header.validation) != VALIDATION_WORD)
return -1; return -1;
if (le16toh(header.checksum) != hdr_checksum(&header)) if (le16_to_cpu(header.checksum) != hdr_checksum(&header))
return -1; return -1;
return le16toh(header.length_u32) * 4; return le16_to_cpu(header.length_u32) * 4;
} }
/* Sign the buffer and return the signed buffer size */ /* Sign the buffer and return the signed buffer size */
@ -116,7 +116,7 @@ static int sign_buffer(uint8_t *buf,
/* Calculate and apply the CRC */ /* Calculate and apply the CRC */
calc_crc = ~pbl_crc32(0, (char *)buf, len); calc_crc = ~pbl_crc32(0, (char *)buf, len);
*((uint32_t *)(buf + len)) = htole32(calc_crc); *((uint32_t *)(buf + len)) = cpu_to_le32(calc_crc);
if (!pad_64k) if (!pad_64k)
return len + 4; return len + 4;
@ -150,7 +150,7 @@ static int verify_buffer(const uint8_t *buf)
calc_crc = ~pbl_crc32(0, (const char *)buf, len); calc_crc = ~pbl_crc32(0, (const char *)buf, len);
buf_crc = le32toh(*((uint32_t *)(buf + len))); buf_crc = le32_to_cpu(*((uint32_t *)(buf + len)));
if (buf_crc != calc_crc) { if (buf_crc != calc_crc) {
fprintf(stderr, "CRC32 does not match (%08x != %08x)\n", fprintf(stderr, "CRC32 does not match (%08x != %08x)\n",