summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml11
-rw-r--r--Makefile2
-rw-r--r--README4
-rw-r--r--arch/arm/mach-exynos/dmc_init_ddr3.c2
-rw-r--r--arch/arm/mach-socfpga/misc.c2
-rw-r--r--arch/mips/mach-au1x00/au1x00_usb_ohci.c3
-rw-r--r--arch/powerpc/cpu/mpc5xxx/usb_ohci.c3
-rw-r--r--arch/powerpc/cpu/ppc4xx/usb_ohci.c3
-rw-r--r--board/logicpd/omap3som/omap3logic.c4
-rw-r--r--board/sysam/amcore/amcore.c2
-rw-r--r--board/ti/common/board_detect.c16
-rw-r--r--board/ti/common/board_detect.h12
-rw-r--r--cmd/bootm.c2
-rw-r--r--cmd/load.c2
-rw-r--r--drivers/net/fec_mxc.c2
-rw-r--r--drivers/usb/host/ohci-hcd.c2
-rw-r--r--drivers/usb/host/ohci-s3c24xx.c2
-rw-r--r--fs/ubifs/ubifs.c2
-rw-r--r--include/configs/omap3_logic.h39
-rw-r--r--include/vsprintf.h4
-rw-r--r--tools/mkimage.c3
21 files changed, 61 insertions, 61 deletions
diff --git a/.travis.yml b/.travis.yml
index cda2d979ee..bb9325bacc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
- qemu-system-x86
- gcc-powerpc-linux-gnu
- gcc-arm-linux-gnueabihf
+ - gcc-aarch64-linux-gnu
- iasl
install:
@@ -54,7 +55,6 @@ env:
before_script:
# install toolchains based on TOOLCHAIN} variable
- - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi
- if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi
- if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi
- if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
@@ -113,7 +113,8 @@ matrix:
- env:
- BUILDMAN="denx"
- env:
- - BUILDMAN="freescale -x powerpc,m68k,aarch64"
+ - JOB="Freescale ARM"
+ BUILDMAN="freescale -x powerpc,m68k"
- env:
- BUILDMAN="sandbox x86"
TOOLCHAIN="x86_64"
@@ -155,11 +156,13 @@ matrix:
- env:
- BUILDMAN="siemens"
- env:
- - BUILDMAN="tegra -x aarch64"
+ - BUILDMAN="tegra"
- env:
- BUILDMAN="ti"
- env:
- - BUILDMAN="aarch64"
+ - BUILDMAN="uniphier"
+ - env:
+ - BUILDMAN="aarch64 -x tegra,freescale,uniphier"
TOOLCHAIN="aarch64"
- env:
- BUILDMAN="sh4"
diff --git a/Makefile b/Makefile
index 75afbfc236..37cbcb28f7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
VERSION = 2016
PATCHLEVEL = 11
SUBLEVEL =
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc3
NAME =
# *DOCUMENTATION*
diff --git a/README b/README
index 39a3042ce4..00830d76df 100644
--- a/README
+++ b/README
@@ -127,7 +127,7 @@ releases in "stable" maintenance trees.
Examples:
U-Boot v2009.11 - Release November 2009
U-Boot v2009.11.1 - Release 1 in version November 2009 stable tree
- U-Boot v2010.09-rc1 - Release candiate 1 for September 2010 release
+ U-Boot v2010.09-rc1 - Release candidate 1 for September 2010 release
Directory Hierarchy:
@@ -1589,7 +1589,7 @@ The following options need to be configured:
This will also enable the command "fatwrite" enabling the
user to write files to FAT.
-CBFS (Coreboot Filesystem) support
+- CBFS (Coreboot Filesystem) support:
CONFIG_CMD_CBFS
Define this to enable support for reading from a Coreboot
diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 25a9df9364..6a5d26cc69 100644
--- a/arch/arm/mach-exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
@@ -618,7 +618,7 @@ int ddr3_mem_ctrl_init(struct mem_timings *mem, int reset)
/*
* Send NOP, MRS and ZQINIT commands
* Sending MRS command will reset the DRAM. We should not be
- * reseting the DRAM after resume, this will lead to memory
+ * resetting the DRAM after resume, this will lead to memory
* corruption as DRAM content is lost after DRAM reset
*/
dmc_config_mrs(mem, &drex0->directcmd);
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 5cbd8a4325..dd6b53b24d 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -362,7 +362,7 @@ int arch_early_init_r(void)
* issuing warm reset. The ancient kernel code expects this
* value to be written into the register by the bootloader, so
* to support that old code, we write it here instead of in the
- * reset_cpu() function just before reseting the CPU.
+ * reset_cpu() function just before resetting the CPU.
*/
writel(0xae9efebc, &sysmgr_regs->romcodegrp_warmramgrp_enable);
diff --git a/arch/mips/mach-au1x00/au1x00_usb_ohci.c b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
index 42484e5712..088e612105 100644
--- a/arch/mips/mach-au1x00/au1x00_usb_ohci.c
+++ b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
@@ -671,7 +671,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf
__u32 info = 0;
unsigned int toggle = 0;
- /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */
+ /* OHCI handles the DATA-toggles itself, we just use the
+ USB-toggle bits for resetting */
if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
toggle = TD_T_TOGGLE;
} else {
diff --git a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
index b7c1b5594a..cf36954fe7 100644
--- a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
@@ -670,7 +670,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf
__u32 info = 0;
unsigned int toggle = 0;
- /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */
+ /* OHCI handles the DATA-toggles itself, we just use the
+ USB-toggle bits for resetting */
if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
toggle = TD_T_TOGGLE;
} else {
diff --git a/arch/powerpc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
index 65a0675446..27423e3779 100644
--- a/arch/powerpc/cpu/ppc4xx/usb_ohci.c
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
@@ -673,7 +673,8 @@ static void td_submit_job (struct usb_device *dev, unsigned long pipe, void *buf
__u32 info = 0;
unsigned int toggle = 0;
- /* OHCI handles the DATA-toggles itself, we just use the USB-toggle bits for reseting */
+ /* OHCI handles the DATA-toggles itself, we just use the
+ USB-toggle bits for resetting */
if(usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
toggle = TD_T_TOGGLE;
} else {
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 3ddeb4647a..de6a06021c 100644
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -219,6 +219,10 @@ int board_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
+ /* If we do not have an fdtimage, let's autodetect it*/
+ if (getenv("fdtimage"))
+ return 0;
+
switch (gd->bd->bi_arch_number) {
case MACH_TYPE_DM3730_TORPEDO:
setenv("fdtimage", "logicpd-torpedo-37xx-devkit.dtb");
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c
index b7217c56ec..77b5000de6 100644
--- a/board/sysam/amcore/amcore.c
+++ b/board/sysam/amcore/amcore.c
@@ -93,7 +93,7 @@ phys_size_t initdram(int board_type)
out_be32((u32 *)0x00000004, 0xbeaddeed);
/* issue AUTOREFRESH */
out_be32(&dc->dacr0, 0x0000b304);
- /* let refresh occour */
+ /* let refresh occur */
fudelay(1);
out_be32(&dc->dacr0, 0x0000b344);
diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c
index e0ae1a51a6..6e7ca9196d 100644
--- a/board/ti/common/board_detect.c
+++ b/board/ti/common/board_detect.c
@@ -131,6 +131,7 @@ int __maybe_unused ti_i2c_eeprom_am_get(int bus_addr, int dev_addr)
ep->name[0] = 0x0;
ep->version[0] = 0x0;
ep->serial[0] = 0x0;
+ ep->config[0] = 0x0;
rc = ti_i2c_eeprom_get(bus_addr, dev_addr, TI_EEPROM_HEADER_MAGIC,
sizeof(am_ep), (uint8_t *)&am_ep);
@@ -171,10 +172,11 @@ int __maybe_unused ti_i2c_eeprom_dra7_get(int bus_addr, int dev_addr)
goto already_read;
/* Initialize with a known bad marker for i2c fails.. */
- ep->header = 0xADEAD12C;
+ ep->header = TI_DEAD_EEPROM_MAGIC;
ep->name[0] = 0x0;
ep->version[0] = 0x0;
ep->serial[0] = 0x0;
+ ep->config[0] = 0x0;
ep->emif1_size = 0;
ep->emif2_size = 0;
@@ -229,9 +231,7 @@ char * __maybe_unused board_ti_get_rev(void)
{
struct ti_common_eeprom *ep = TI_EEPROM_DATA;
- if (ep->header == TI_DEAD_EEPROM_MAGIC)
- return NULL;
-
+ /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */
return ep->version;
}
@@ -239,9 +239,7 @@ char * __maybe_unused board_ti_get_config(void)
{
struct ti_common_eeprom *ep = TI_EEPROM_DATA;
- if (ep->header == TI_DEAD_EEPROM_MAGIC)
- return NULL;
-
+ /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */
return ep->config;
}
@@ -249,9 +247,7 @@ char * __maybe_unused board_ti_get_name(void)
{
struct ti_common_eeprom *ep = TI_EEPROM_DATA;
- if (ep->header == TI_DEAD_EEPROM_MAGIC)
- return NULL;
-
+ /* if ep->header == TI_DEAD_EEPROM_MAGIC, this is empty already */
return ep->name;
}
diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h
index eb17f6f52a..343fcb463e 100644
--- a/board/ti/common/board_detect.h
+++ b/board/ti/common/board_detect.h
@@ -133,7 +133,7 @@ bool board_ti_is(char *name_tag);
*
* NOTE: revision information is often messed up (hence the str len match) :(
*
- * Return: false if board information does not match OR eeprom was'nt read.
+ * Return: false if board information does not match OR eeprom wasn't read.
* true otherwise
*/
bool board_ti_rev_is(char *rev_tag, int cmp_len);
@@ -141,7 +141,7 @@ bool board_ti_rev_is(char *rev_tag, int cmp_len);
/**
* board_ti_get_rev() - Get board revision for TI EVMs
*
- * Return: NULL if eeprom was'nt read.
+ * Return: Empty string if eeprom wasn't read.
* Board revision otherwise
*/
char *board_ti_get_rev(void);
@@ -149,7 +149,7 @@ char *board_ti_get_rev(void);
/**
* board_ti_get_config() - Get board config for TI EVMs
*
- * Return: NULL if eeprom was'nt read.
+ * Return: Empty string if eeprom wasn't read.
* Board config otherwise
*/
char *board_ti_get_config(void);
@@ -157,7 +157,7 @@ char *board_ti_get_config(void);
/**
* board_ti_get_name() - Get board name for TI EVMs
*
- * Return: NULL if eeprom was'nt read.
+ * Return: Empty string if eeprom wasn't read.
* Board name otherwise
*/
char *board_ti_get_name(void);
@@ -174,14 +174,14 @@ void board_ti_get_eth_mac_addr(int index, u8 mac_addr[TI_EEPROM_HDR_ETH_ALEN]);
/**
* board_ti_get_emif1_size() - Get size of the DDR on emif1 for TI EVMs
*
- * Return: NULL if eeprom was'nt read or emif1_size is not available.
+ * Return: NULL if eeprom wasn't read or emif1_size is not available.
*/
u64 board_ti_get_emif1_size(void);
/**
* board_ti_get_emif2_size() - Get size of the DDR on emif2 for TI EVMs
*
- * Return: NULL if eeprom was'nt read or emif2_size is not available.
+ * Return: NULL if eeprom wasn't read or emif2_size is not available.
*/
u64 board_ti_get_emif2_size(void);
diff --git a/cmd/bootm.c b/cmd/bootm.c
index e02a1c54b7..083f3d19fe 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -162,7 +162,7 @@ static char bootm_help_text[] =
#endif
#if defined(CONFIG_FIT)
"\t\nFor the new multi component uImage format (FIT) addresses\n"
- "\tmust be extened to include component or configuration unit name:\n"
+ "\tmust be extended to include component or configuration unit name:\n"
"\taddr:<subimg_uname> - direct component image specification\n"
"\taddr#<conf_uname> - configuration specification\n"
"\tUse iminfo command to get the list of existing component\n"
diff --git a/cmd/load.c b/cmd/load.c
index 65557e4f9e..77c3359b29 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -997,7 +997,7 @@ static ulong load_serial_ymodem(ulong offset, int mode)
xyzModem_stream_terminate(false, &getcxmodem);
- flush_cache(offset, size);
+ flush_cache(offset, ALIGN(size, ARCH_DMA_MINALIGN));
printf("## Total Size = 0x%08x = %d Bytes\n", size, size);
setenv_hex("filesize", size);
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 8e3b839865..84021ea5be 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1024,7 +1024,7 @@ static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
start = get_timer(0);
while (readl(&fec->eth->ecntrl) & FEC_ECNTRL_RESET) {
if (get_timer(start) > (CONFIG_SYS_HZ * 5)) {
- printf("FEC MXC: Timeout reseting chip\n");
+ printf("FEC MXC: Timeout resetting chip\n");
goto err4;
}
udelay(10);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 0f6d03ec3b..80cfe11290 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -964,7 +964,7 @@ static void td_submit_job(ohci_t *ohci, struct usb_device *dev,
flush_dcache_buffer(buffer, data_len);
/* OHCI handles the DATA-toggles itself, we just use the USB-toggle
- * bits for reseting */
+ * bits for resetting */
if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
toggle = TD_T_TOGGLE;
} else {
diff --git a/drivers/usb/host/ohci-s3c24xx.c b/drivers/usb/host/ohci-s3c24xx.c
index 8bb2275c09..28b9ab5176 100644
--- a/drivers/usb/host/ohci-s3c24xx.c
+++ b/drivers/usb/host/ohci-s3c24xx.c
@@ -677,7 +677,7 @@ static void td_submit_job(struct usb_device *dev, unsigned long pipe,
unsigned int toggle = 0;
/* OHCI handles the DATA-toggles itself, we just
- use the USB-toggle bits for reseting */
+ use the USB-toggle bits for resetting */
if (usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {
toggle = TD_T_TOGGLE;
} else {
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index cdc04c662d..cc397d605b 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -854,7 +854,7 @@ int ubifs_read(const char *filename, void *buf, loff_t offset,
*actread = 0;
if (offset & (PAGE_SIZE - 1)) {
- printf("ubifs: Error offset must be a multple of %d\n",
+ printf("ubifs: Error offset must be a multiple of %d\n",
PAGE_SIZE);
return -1;
}
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index a7649cabd7..0827ebedfd 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -128,27 +128,7 @@
/* Environment information */
-/*
- * PREBOOT assumes the 4.3" display is attached. User can interrupt
- * and modify display variable to suit their needs.
- */
#define CONFIG_PREBOOT \
- "echo ======================NOTICE============================;"\
- "echo \"The u-boot environment is not set.\";" \
- "echo \"If using a display a valid display variable for your panel\";" \
- "echo \"needs to be set.\";" \
- "echo \"Valid display options are:\";" \
- "echo \" 2 == LQ121S1DG31 TFT SVGA (12.1) Sharp\";" \
- "echo \" 3 == LQ036Q1DA01 TFT QVGA (3.6) Sharp w/ASIC\";" \
- "echo \" 5 == LQ064D343 TFT VGA (6.4) Sharp\";" \
- "echo \" 7 == LQ10D368 TFT VGA (10.4) Sharp\";" \
- "echo \" 15 == LQ043T1DG01 TFT WQVGA (4.3) Sharp (DEFAULT)\";" \
- "echo \" vga[-dvi or -hdmi] LCD VGA 640x480\";" \
- "echo \" svga[-dvi or -hdmi] LCD SVGA 800x600\";" \
- "echo \" xga[-dvi or -hdmi] LCD XGA 1024x768\";" \
- "echo \" 720p[-dvi or -hdmi] LCD 720P 1280x720\";" \
- "echo \"Defaulting to 4.3 LCD panel (display=15).\";" \
- "setenv display 15;" \
"setenv preboot;" \
"nand unlock;" \
"saveenv;"
@@ -209,6 +189,12 @@
"${optargs} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
+ "nfsargs=run setconsole; setenv serverip ${tftpserver}; " \
+ "setenv bootargs console=${console} root=/dev/nfs " \
+ "nfsroot=${nfsrootpath} " \
+ "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \
+ "nfsrootpath=/opt/nfs-exports/omap\0" \
+ "autoload=no\0" \
"fdtaddr=0x86000000\0" \
"loadfdtimage=mmc rescan; " \
"fatload mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
@@ -233,14 +219,21 @@
"run loadzimage; " \
"run loadramdisk; " \
"run loadfdtimage; " \
- "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr}\0; " \
+ "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr};\0" \
"tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
"run ramargs; " \
"run common_bootargs; " \
"run dump_bootargs; " \
- "tftpboot ${loadaddr} ${uimage}; " \
+ "tftpboot ${loadaddr} ${zimage}; " \
"tftpboot ${ramdiskaddr} ${ramdiskimage}; " \
- "bootm ${loadaddr} ${ramdiskaddr}\0"
+ "bootm ${loadaddr} ${ramdiskaddr}\0" \
+ "tftpbootz=echo 'Booting kernel NFS rootfs...'; " \
+ "dhcp;" \
+ "run nfsargs;" \
+ "run common_bootargs;" \
+ "run dump_bootargs;" \
+ "tftpboot $loadaddr zImage;" \
+ "bootz $loadaddr\0"
#define CONFIG_BOOTCOMMAND \
"run autoboot"
diff --git a/include/vsprintf.h b/include/vsprintf.h
index 60e91d119e..e38076d22d 100644
--- a/include/vsprintf.h
+++ b/include/vsprintf.h
@@ -72,7 +72,7 @@ long trailing_strtoln(const char *str, const char *end);
* panic() - Print a message and reset/hang
*
* Prints a message on the console(s) and then resets. If CONFIG_PANIC_HANG is
- * defined, then it will hang instead of reseting.
+ * defined, then it will hang instead of resetting.
*
* @param fmt: printf() format string for message, which should not include
* \n, followed by arguments
@@ -84,7 +84,7 @@ void panic(const char *fmt, ...)
* panic_str() - Print a message and reset/hang
*
* Prints a message on the console(s) and then resets. If CONFIG_PANIC_HANG is
- * defined, then it will hang instead of reseting.
+ * defined, then it will hang instead of resetting.
*
* This function can be used instead of panic() when your board does not
* already use printf(), * to keep code size small.
diff --git a/tools/mkimage.c b/tools/mkimage.c
index 3c594a0f3b..0c6dba89a0 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -64,6 +64,7 @@ static int show_valid_options(enum ih_category category)
genimg_get_cat_name(category, item));
}
fprintf(stderr, "\n");
+ free(order);
return 0;
}
@@ -88,7 +89,7 @@ static void usage(const char *msg)
params.cmdname);
fprintf(stderr,
" %s [-D dtc_options] [-f fit-image.its|-f auto|-F] [-b <dtb> [-b <dtb>]] fit-image\n"
- " <dtb> file is used with -f auto, it may occour multiple times.\n",
+ " <dtb> file is used with -f auto, it may occur multiple times.\n",
params.cmdname);
fprintf(stderr,
" -D => set all options for device tree compiler\n"
generated by cgit v1.2.3 (git 2.0.4) at 2024-07-04 22:55:21 +0000