mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-27 22:56:49 +08:00
Merge branch '2021-11-15-assorted-fixes'
- Rename "tqc" to "tq" and related updates - Assorted minor ARM updates, build updates and documentation updates
This commit is contained in:
Tom Rini
commit
3144ba23bf
2
Makefile
2
Makefile
@ -1246,7 +1246,7 @@ binary_size_check: u-boot-nodtb.bin FORCE
|
||||
echo "u-boot.map shows a binary size of $$map_size" >&2 ; \
|
||||
echo " but u-boot-nodtb.bin shows $$file_size" >&2 ; \
|
||||
exit 1; \
|
||||
fi \
|
||||
fi; \
|
||||
fi
|
||||
|
||||
ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy)
|
||||
|
||||
@ -210,7 +210,7 @@ ENTRY(memcpy)
|
||||
orr r9, r9, ip, lspush #\push
|
||||
mov ip, ip, lspull #\pull
|
||||
orr ip, ip, lr, lspush #\push
|
||||
str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
|
||||
str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f
|
||||
bge 12b
|
||||
PLD( cmn r2, #96 )
|
||||
PLD( bge 13b )
|
||||
|
||||
@ -569,7 +569,7 @@ config TARGET_KP_IMX6Q_TPC
|
||||
imply CMD_SPL
|
||||
|
||||
config TARGET_TQMA6
|
||||
bool "TQ Systems TQMa6 board"
|
||||
bool "TQ-Systems TQMa6 board"
|
||||
select BOARD_EARLY_INIT_F
|
||||
select BOARD_LATE_INIT
|
||||
select MXC_SPI
|
||||
@ -688,7 +688,7 @@ source "board/somlabs/visionsom-6ull/Kconfig"
|
||||
source "board/technexion/pico-imx6/Kconfig"
|
||||
source "board/technexion/pico-imx6ul/Kconfig"
|
||||
source "board/tbs/tbs2910/Kconfig"
|
||||
source "board/tqc/tqma6/Kconfig"
|
||||
source "board/tq/tqma6/Kconfig"
|
||||
source "board/toradex/apalis_imx6/Kconfig"
|
||||
source "board/toradex/colibri_imx6/Kconfig"
|
||||
source "board/toradex/colibri-imx6ull/Kconfig"
|
||||
|
||||
@ -4,7 +4,7 @@ config SYS_BOARD
|
||||
default "tqma6"
|
||||
|
||||
config SYS_VENDOR
|
||||
default "tqc"
|
||||
default "tq"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "tqma6"
|
||||
@ -89,8 +89,8 @@ config SYS_TEXT_BASE
|
||||
default 0x4fc00000 if TQMA6Q || TQMA6DL
|
||||
|
||||
config IMX_CONFIG
|
||||
default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q
|
||||
default "board/tqc/tqma6/tqma6dl.cfg" if TQMA6DL
|
||||
default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S
|
||||
default "board/tq/tqma6/tqma6q.cfg" if TQMA6Q
|
||||
default "board/tq/tqma6/tqma6dl.cfg" if TQMA6DL
|
||||
default "board/tq/tqma6/tqma6s.cfg" if TQMA6S
|
||||
|
||||
endif
|
||||
@ -1,6 +1,6 @@
|
||||
TQ SYSTEMS TQMA6 BOARD
|
||||
TQ-SYSTEMS TQMA6 BOARD
|
||||
M: Markus Niebel <Markus.Niebel@tq-group.com>
|
||||
S: Maintained
|
||||
F: board/tqc/tqma6/
|
||||
F: board/tq/tqma6/
|
||||
F: include/configs/tqma6.h
|
||||
F: configs/tqma6*_defconfig
|
||||
@ -1,7 +1,7 @@
|
||||
U-Boot for the TQ Systems TQMa6 modules
|
||||
U-Boot for the TQ-Systems TQMa6 modules
|
||||
|
||||
This file contains information for the port of
|
||||
U-Boot to the TQ Systems TQMa6 modules.
|
||||
U-Boot to the TQ-Systems TQMa6 modules.
|
||||
|
||||
1. Boot source
|
||||
--------------
|
||||
@ -14,7 +14,7 @@ The following boot source is supported:
|
||||
2. Building
|
||||
------------
|
||||
|
||||
To build U-Boot for the TQ Systems TQMa6 modules:
|
||||
To build U-Boot for the TQ-Systems TQMa6 modules:
|
||||
|
||||
make tqma6<x>_<baseboard>_<boot>_config
|
||||
make
|
||||
@ -3,7 +3,7 @@
|
||||
* Copyright (C) 2012 Freescale Semiconductor, Inc.
|
||||
* Author: Fabio Estevam <fabio.estevam@freescale.com>
|
||||
*
|
||||
* Copyright (C) 2013, 2014 TQ Systems (ported SabreSD to TQMa6x)
|
||||
* Copyright (C) 2013, 2014 TQ-Systems (ported SabreSD to TQMa6x)
|
||||
* Author: Markus Niebel <markus.niebel@tq-group.com>
|
||||
*/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) 2013, 2014 TQ Systems
|
||||
* Copyright (C) 2013, 2014 TQ-Systems
|
||||
* Author: Markus Niebel <markus.niebel@tq-group.com>
|
||||
*/
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* Copyright (C) 2012 Freescale Semiconductor, Inc.
|
||||
* Author: Fabio Estevam <fabio.estevam@freescale.com>
|
||||
*
|
||||
* Copyright (C) 2013, 2014 TQ Systems (ported SabreSD to TQMa6x)
|
||||
* Copyright (C) 2013, 2014 TQ-Systems (ported SabreSD to TQMa6x)
|
||||
* Author: Markus Niebel <markus.niebel@tq-group.com>
|
||||
*/
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* Copyright (C) 2012 Freescale Semiconductor, Inc.
|
||||
* Author: Fabio Estevam <fabio.estevam@freescale.com>
|
||||
*
|
||||
* Copyright (C) 2013, 2014 TQ Systems (ported SabreSD to TQMa6x)
|
||||
* Copyright (C) 2013, 2014 TQ-Systems (ported SabreSD to TQMa6x)
|
||||
* Author: Markus Niebel <markus.niebel@tq-group.com>
|
||||
*
|
||||
* Copyright (C) 2015 Stefan Roese <sr@denx.de>
|
||||
@ -14,6 +14,7 @@
|
||||
#include <env.h>
|
||||
#include <fpga.h>
|
||||
#include <image.h>
|
||||
#include <init.h>
|
||||
#include <mapmem.h>
|
||||
#include <rtc.h>
|
||||
#include <watchdog.h>
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
#ifndef USE_HOSTCC
|
||||
#include <common.h>
|
||||
#include <env.h>
|
||||
#include <init.h>
|
||||
#include <lmb.h>
|
||||
#include <log.h>
|
||||
#include <malloc.h>
|
||||
@ -29,11 +30,6 @@
|
||||
#include <linux/errno.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifdef CONFIG_CMD_BDI
|
||||
extern int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
char *const argv[]);
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
/* Set this if we have less than 4 MB of malloc() space */
|
||||
|
||||
@ -18,8 +18,8 @@ How it works:
|
||||
-------------
|
||||
|
||||
The USB (at least the USB UHCI) needs a frame list (4k), transfer
|
||||
descripor and queue headers which are all located in the main memory.
|
||||
The UHCI allocates every milisecond the PCI bus and reads the current
|
||||
descriptor and queue headers which are all located in the main memory.
|
||||
The UHCI allocates every millisecond the PCI bus and reads the current
|
||||
frame pointer. This may cause to crash the OS during boot. So the USB
|
||||
_MUST_ be stopped during OS boot. This is the reason, why the USB is
|
||||
NOT automatically started during start-up. If someone needs the USB
|
||||
@ -27,10 +27,10 @@ he has to start it and should therefore be aware that he had to stop
|
||||
it before booting the OS.
|
||||
|
||||
For USB keyboards this can be done by a script which is automatically
|
||||
started after the U-Boot is up and running. To boot an OS with a an
|
||||
started after the U-Boot is up and running. To boot an OS with a
|
||||
USB keyboard another script is necessary, which first disables the
|
||||
USB and then executes the boot command. If the boot command fails,
|
||||
the script can reenable the USB kbd.
|
||||
the script can re-enable the USB keyboard.
|
||||
|
||||
Common USB Commands:
|
||||
- usb start:
|
||||
@ -40,10 +40,10 @@ Common USB Commands:
|
||||
- usb info [dev]: shows all USB infos of the device dev, or of all
|
||||
the devices
|
||||
- usb stop [f]: stops the USB. If f==1 the USB will also stop if
|
||||
an USB keyboard is assigned as stdin. The stdin
|
||||
a USB keyboard is assigned as stdin. The stdin
|
||||
is then switched to serial input.
|
||||
Storage USB Commands:
|
||||
- usb scan: scans the USB for storage devices.The USB must be
|
||||
- usb scan: scans the USB for storage devices. The USB must be
|
||||
running for this command (usb start)
|
||||
- usb device [dev]: show or set current USB storage device
|
||||
- usb part [dev]: print partition table of one or all USB storage
|
||||
@ -57,7 +57,7 @@ Storage USB Commands:
|
||||
Config Switches:
|
||||
----------------
|
||||
CONFIG_CMD_USB enables basic USB support and the usb command
|
||||
CONFIG_USB_UHCI defines the lowlevel part.A lowlevel part must be defined
|
||||
CONFIG_USB_UHCI defines the lowlevel part. A lowlevel part must be defined
|
||||
if using CONFIG_CMD_USB
|
||||
CONFIG_USB_KEYBOARD enables the USB Keyboard
|
||||
CONFIG_USB_STORAGE enables the USB storage devices
|
||||
@ -124,7 +124,7 @@ bootp
|
||||
|
||||
To enable USB Host Ethernet in U-Boot, your platform must of course
|
||||
support USB with CONFIG_CMD_USB enabled and working. You will need to
|
||||
add some config settings to your board config:
|
||||
add some settings to your board configuration:
|
||||
|
||||
CONFIG_CMD_USB=y /* the 'usb' interactive command */
|
||||
CONFIG_USB_HOST_ETHER=y /* Enable USB Ethernet adapters */
|
||||
@ -158,7 +158,7 @@ settings should start you off:
|
||||
You can also set the default IP address of your board and the server
|
||||
as well as the default file to load when a 'bootp' command is issued.
|
||||
However note that encoding these individual network settings into a
|
||||
common exectuable is discouraged, as it leads to potential conflicts,
|
||||
common executable is discouraged, as it leads to potential conflicts,
|
||||
and all the parameters can either get stored in the board's external
|
||||
environment, or get obtained from the bootp server if not set.
|
||||
|
||||
@ -166,7 +166,6 @@ environment, or get obtained from the bootp server if not set.
|
||||
#define CONFIG_SERVERIP 10.0.0.1 (replace with your value)
|
||||
#define CONFIG_BOOTFILE "uImage"
|
||||
|
||||
|
||||
The 'usb start' command should identify the adapter something like this:
|
||||
|
||||
CrOS> usb start
|
||||
@ -211,8 +210,8 @@ MAC Addresses
|
||||
|
||||
Most Ethernet dongles have a built-in MAC address which is unique in the
|
||||
world. This is important so that devices on the network can be
|
||||
distinguised from each other. MAC address conflicts are evil and
|
||||
generally result in strange and eratic behaviour.
|
||||
distinguished from each other. MAC address conflicts are evil and
|
||||
generally result in strange and erratic behaviour.
|
||||
|
||||
Some boards have USB Ethernet chips on-board, and these sometimes do not
|
||||
have an assigned MAC address. In this case it is up to you to assign
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
/* #define CONFIG_SYS_PCI_64BIT 1 */
|
||||
|
||||
#define DEFAULT_DFU_ALT_INFO "dfu_alt_info=" \
|
||||
"mtd mx66u51235f=u-boot.bin raw 200000 100000;" \
|
||||
"mtd nor1=u-boot.bin raw 200000 100000;" \
|
||||
"fip.bin raw 180000 78000;" \
|
||||
"optee.bin raw 500000 100000\0"
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
* Copyright (C) 2013, 2014, 2017 Markus Niebel <Markus.Niebel@tq-group.com>
|
||||
*
|
||||
* Configuration settings for the TQ Systems TQMa6<Q,D,DL,S> module.
|
||||
* Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/*
|
||||
* Copyright (C) 2013 - 2017 Markus Niebel <Markus.Niebel@tq-group.com>
|
||||
*
|
||||
* Configuration settings for the TQ Systems TQMa6<Q,D,DL,S> module on
|
||||
* Configuration settings for the TQ-Systems TQMa6<Q,D,DL,S> module on
|
||||
* MBa6 starter kit
|
||||
*/
|
||||
|
||||
|
||||
@ -332,6 +332,8 @@ void bdinfo_print_mhz(const char *name, unsigned long hz);
|
||||
/* Show arch-specific information for the 'bd' command */
|
||||
void arch_print_bdinfo(void);
|
||||
|
||||
int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
/* Put only stuff here that the assembler can digest */
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ quiet_cmd_autoconf = GEN $@
|
||||
if [ -n "${KCONFIG_IGNORE_DUPLICATES}" ] || \
|
||||
! grep -q "$${line%=*}=" include/config/auto.conf; then \
|
||||
echo "$$line"; \
|
||||
fi \
|
||||
fi; \
|
||||
done > $@
|
||||
|
||||
quiet_cmd_u_boot_cfg = CFG $@
|
||||
|
||||
@ -63,7 +63,7 @@ int main(int argc, char **argv)
|
||||
{
|
||||
FILE *f;
|
||||
int i, num;
|
||||
uint64_t rela_start, rela_end, text_base;
|
||||
uint64_t rela_start, rela_end, text_base, file_size;
|
||||
|
||||
if (argc != 5) {
|
||||
fprintf(stderr, "Statically apply ELF rela relocations\n");
|
||||
@ -87,8 +87,7 @@ int main(int argc, char **argv)
|
||||
return 3;
|
||||
}
|
||||
|
||||
if (rela_start > rela_end || rela_start < text_base ||
|
||||
(rela_end - rela_start) % sizeof(Elf64_Rela)) {
|
||||
if (rela_start > rela_end || rela_start < text_base) {
|
||||
fprintf(stderr, "%s: bad rela bounds\n", argv[0]);
|
||||
return 3;
|
||||
}
|
||||
@ -96,6 +95,21 @@ int main(int argc, char **argv)
|
||||
rela_start -= text_base;
|
||||
rela_end -= text_base;
|
||||
|
||||
fseek(f, 0, SEEK_END);
|
||||
file_size = ftell(f);
|
||||
rewind(f);
|
||||
|
||||
if (rela_end > file_size) {
|
||||
// Most likely compiler inserted some section that didn't get
|
||||
// objcopy-ed into the final binary
|
||||
rela_end = file_size;
|
||||
}
|
||||
|
||||
if ((rela_end - rela_start) % sizeof(Elf64_Rela)) {
|
||||
fprintf(stderr, "%s: rela size isn't a multiple of Elf64_Rela\n", argv[0]);
|
||||
return 3;
|
||||
}
|
||||
|
||||
num = (rela_end - rela_start) / sizeof(Elf64_Rela);
|
||||
|
||||
for (i = 0; i < num; i++) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user