mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
Merge branch '2020-02-13-master-imports'
- Minor Kconfig fixes - Ensure we use python3 on all CI in all cases. - Other minor fixes
This commit is contained in:
commit
f20d81e1d4
@ -123,7 +123,7 @@ jobs:
|
||||
git config --global user.name "Azure Pipelines"
|
||||
git config --global user.email bmeng.cn@gmail.com
|
||||
export USER=azure
|
||||
virtualenv /tmp/venv
|
||||
virtualenv -p /usr/bin/python3 /tmp/venv
|
||||
. /tmp/venv/bin/activate
|
||||
pip install pyelftools
|
||||
export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl
|
||||
|
@ -72,7 +72,7 @@ build all 64bit ARM platforms:
|
||||
tags: [ 'all' ]
|
||||
stage: world build
|
||||
script:
|
||||
- virtualenv /tmp/venv
|
||||
- virtualenv -p /usr/bin/python3 /tmp/venv
|
||||
- . /tmp/venv/bin/activate
|
||||
- pip install pyelftools
|
||||
- ret=0;
|
||||
@ -157,7 +157,7 @@ Run binman, buildman, dtoc and patman testsuites:
|
||||
- git config --global user.name "GitLab CI Runner";
|
||||
git config --global user.email trini@konsulko.com;
|
||||
export USER=gitlab;
|
||||
virtualenv /tmp/venv;
|
||||
virtualenv -p /usr/bin/python3 /tmp/venv;
|
||||
. /tmp/venv/bin/activate;
|
||||
pip install pyelftools;
|
||||
export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl;
|
||||
|
18
.travis.yml
18
.travis.yml
@ -133,16 +133,6 @@ script:
|
||||
cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/;
|
||||
cp ~/grub2-arm/usr/lib/grub2/arm-efi/grub.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi;
|
||||
cp ~/grub2-arm64/usr/lib/grub2/arm64-efi/grub.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi;
|
||||
if [[ -n "${TEST_PY_TOOLS}" ]]; then
|
||||
PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"
|
||||
PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"
|
||||
./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test &&
|
||||
./tools/patman/patman --test &&
|
||||
./tools/buildman/buildman -t &&
|
||||
PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"
|
||||
PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"
|
||||
./tools/dtoc/dtoc -t;
|
||||
fi;
|
||||
if [[ "${TEST_PY_BD}" != "" ]]; then
|
||||
virtualenv -p /usr/bin/python3 /tmp/venv;
|
||||
. /tmp/venv/bin/activate;
|
||||
@ -154,6 +144,14 @@ script:
|
||||
if [[ $ret -ne 0 ]]; then
|
||||
exit $ret;
|
||||
fi;
|
||||
if [[ -n "${TEST_PY_TOOLS}" ]]; then
|
||||
export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt";
|
||||
export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
|
||||
./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test &&
|
||||
./tools/patman/patman --test &&
|
||||
./tools/buildman/buildman -t &&
|
||||
./tools/dtoc/dtoc -t;
|
||||
fi;
|
||||
fi
|
||||
|
||||
matrix:
|
||||
|
@ -867,6 +867,11 @@ __weak int checkcpu(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
__weak int clear_bss(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const init_fnc_t init_sequence_f[] = {
|
||||
setup_mon_len,
|
||||
#ifdef CONFIG_OF_CONTROL
|
||||
@ -1002,11 +1007,8 @@ static const init_fnc_t init_sequence_f[] = {
|
||||
#if defined(CONFIG_X86) || defined(CONFIG_ARC)
|
||||
copy_uboot_to_ram,
|
||||
do_elf_reloc_fixups,
|
||||
clear_bss,
|
||||
#endif
|
||||
#if defined(CONFIG_XTENSA)
|
||||
clear_bss,
|
||||
#endif
|
||||
#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \
|
||||
!CONFIG_IS_ENABLED(X86_64)
|
||||
jump_to_copy,
|
||||
|
@ -401,7 +401,7 @@ int getc(void)
|
||||
if (gd->console_in.start) {
|
||||
int ch;
|
||||
|
||||
ch = membuff_getbyte(&gd->console_in);
|
||||
ch = membuff_getbyte((struct membuff *)&gd->console_in);
|
||||
if (ch != -1)
|
||||
return 1;
|
||||
}
|
||||
@ -426,7 +426,7 @@ int tstc(void)
|
||||
return 0;
|
||||
#ifdef CONFIG_CONSOLE_RECORD
|
||||
if (gd->console_in.start) {
|
||||
if (membuff_peekbyte(&gd->console_in) != -1)
|
||||
if (membuff_peekbyte((struct membuff *)&gd->console_in) != -1)
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
@ -518,7 +518,7 @@ void putc(const char c)
|
||||
return;
|
||||
#ifdef CONFIG_CONSOLE_RECORD
|
||||
if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start)
|
||||
membuff_putbyte(&gd->console_out, c);
|
||||
membuff_putbyte((struct membuff *)&gd->console_out, c);
|
||||
#endif
|
||||
#ifdef CONFIG_SILENT_CONSOLE
|
||||
if (gd->flags & GD_FLG_SILENT) {
|
||||
@ -569,7 +569,7 @@ void puts(const char *s)
|
||||
return;
|
||||
#ifdef CONFIG_CONSOLE_RECORD
|
||||
if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start)
|
||||
membuff_put(&gd->console_out, s, strlen(s));
|
||||
membuff_put((struct membuff *)&gd->console_out, s, strlen(s));
|
||||
#endif
|
||||
#ifdef CONFIG_SILENT_CONSOLE
|
||||
if (gd->flags & GD_FLG_SILENT) {
|
||||
@ -602,18 +602,20 @@ int console_record_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = membuff_new(&gd->console_out, CONFIG_CONSOLE_RECORD_OUT_SIZE);
|
||||
ret = membuff_new((struct membuff *)&gd->console_out,
|
||||
CONFIG_CONSOLE_RECORD_OUT_SIZE);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = membuff_new(&gd->console_in, CONFIG_CONSOLE_RECORD_IN_SIZE);
|
||||
ret = membuff_new((struct membuff *)&gd->console_in,
|
||||
CONFIG_CONSOLE_RECORD_IN_SIZE);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void console_record_reset(void)
|
||||
{
|
||||
membuff_purge(&gd->console_out);
|
||||
membuff_purge(&gd->console_in);
|
||||
membuff_purge((struct membuff *)&gd->console_out);
|
||||
membuff_purge((struct membuff *)&gd->console_in);
|
||||
}
|
||||
|
||||
void console_record_reset_enable(void)
|
||||
@ -624,12 +626,13 @@ void console_record_reset_enable(void)
|
||||
|
||||
int console_record_readline(char *str, int maxlen)
|
||||
{
|
||||
return membuff_readline(&gd->console_out, str, maxlen, ' ');
|
||||
return membuff_readline((struct membuff *)&gd->console_out, str,
|
||||
maxlen, ' ');
|
||||
}
|
||||
|
||||
int console_record_avail(void)
|
||||
{
|
||||
return membuff_avail(&gd->console_out);
|
||||
return membuff_avail((struct membuff *)&gd->console_out);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -14,5 +14,6 @@ Board-specific doc
|
||||
google/index
|
||||
intel/index
|
||||
renesas/index
|
||||
rockchip/index
|
||||
sifive/index
|
||||
xilinx/index
|
||||
|
@ -13,6 +13,7 @@ config ROCKCHIP_SDRAM_COMMON
|
||||
|
||||
config RAM_ROCKCHIP_DEBUG
|
||||
bool "Rockchip ram drivers debugging"
|
||||
depends on RAM_ROCKCHIP
|
||||
default y
|
||||
help
|
||||
This enables debugging ram driver API's for the platforms
|
||||
|
@ -488,8 +488,8 @@
|
||||
typedef u64 pci_addr_t;
|
||||
typedef u64 pci_size_t;
|
||||
#else
|
||||
typedef u32 pci_addr_t;
|
||||
typedef u32 pci_size_t;
|
||||
typedef unsigned long pci_addr_t;
|
||||
typedef unsigned long pci_size_t;
|
||||
#endif
|
||||
|
||||
struct pci_region {
|
||||
|
10
net/Kconfig
10
net/Kconfig
@ -29,6 +29,16 @@ config IP_DEFRAG
|
||||
Selecting this will enable IP datagram reassembly according
|
||||
to the algorithm in RFC815.
|
||||
|
||||
config NET_MAXDEFRAG
|
||||
int "Size of buffer used for IP datagram reassembly"
|
||||
depends on IP_DEFRAG
|
||||
default 16384
|
||||
range 1024 65536
|
||||
help
|
||||
This defines the size of the statically allocated buffer
|
||||
used for reassembly, and thus an upper bound for the size of
|
||||
IP datagrams that can be received.
|
||||
|
||||
config TFTP_BLOCKSIZE
|
||||
int "TFTP block size"
|
||||
default 1468
|
||||
|
@ -883,9 +883,6 @@ int net_send_ip_packet(uchar *ether, struct in_addr dest, int dport, int sport,
|
||||
* to the algorithm in RFC815. It returns NULL or the pointer to
|
||||
* a complete packet, in static storage
|
||||
*/
|
||||
#ifndef CONFIG_NET_MAXDEFRAG
|
||||
#define CONFIG_NET_MAXDEFRAG 16384
|
||||
#endif
|
||||
#define IP_PKTSIZE (CONFIG_NET_MAXDEFRAG)
|
||||
|
||||
#define IP_MAXUDP (IP_PKTSIZE - IP_HDR_SIZE)
|
||||
|
@ -1212,7 +1212,6 @@ CONFIG_NETSPACE_LITE_V2
|
||||
CONFIG_NETSPACE_MAX_V2
|
||||
CONFIG_NETSPACE_MINI_V2
|
||||
CONFIG_NETSPACE_V2
|
||||
CONFIG_NET_MAXDEFRAG
|
||||
CONFIG_NET_MULTI
|
||||
CONFIG_NET_RETRY_COUNT
|
||||
CONFIG_NEVER_ASSERT_ODT_TO_CPU
|
||||
|
@ -88,17 +88,17 @@ static int _lib_test_aes_run(struct unit_test_state *uts, int key_len,
|
||||
|
||||
/* Allocate all the buffer */
|
||||
key = malloc(key_len);
|
||||
ut_assertnonnull(key);
|
||||
key_exp = malloc(key_exp_len);
|
||||
ut_assertnonnull(key_exp);
|
||||
iv = malloc(AES_BLOCK_LENGTH);
|
||||
ut_assertnonnull(iv);
|
||||
nocipher = malloc(num_block * AES_BLOCK_LENGTH);
|
||||
ut_assertnonnull(nocipher);
|
||||
ciphered = malloc((num_block + 1) * AES_BLOCK_LENGTH);
|
||||
ut_assertnonnull(ciphered);
|
||||
uncipher = malloc((num_block + 1) * AES_BLOCK_LENGTH);
|
||||
ut_assertnonnull(uncipher);
|
||||
|
||||
if (!key || !key_exp || !iv || !nocipher || !ciphered || !uncipher) {
|
||||
printf("%s: can't allocate memory\n", __func__);
|
||||
ret = -1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Initialize all buffer */
|
||||
rand_buf(key, key_len);
|
||||
@ -127,6 +127,7 @@ static int _lib_test_aes_run(struct unit_test_state *uts, int key_len,
|
||||
ret = -1;
|
||||
};
|
||||
|
||||
out:
|
||||
/* Free all the data */
|
||||
free(key);
|
||||
free(key_exp);
|
||||
|
Loading…
Reference in New Issue
Block a user