Merge branch 'for-next/misc'
This commit is contained in:
commit
dd534571bd
|
@ -314,9 +314,5 @@ endif
|
||||||
common- += $(patsubst %,arch/arm/boards/%/,$(board-))
|
common- += $(patsubst %,arch/arm/boards/%/,$(board-))
|
||||||
|
|
||||||
CLEAN_FILES += include/generated/mach-types.h barebox-flash-image
|
CLEAN_FILES += include/generated/mach-types.h barebox-flash-image
|
||||||
|
|
||||||
ifeq ($(CONFIG_CPU_V8), y)
|
|
||||||
CLEAN_FILES += arch/arm/lib64/barebox.lds
|
CLEAN_FILES += arch/arm/lib64/barebox.lds
|
||||||
else
|
|
||||||
CLEAN_FILES += arch/arm/lib32/barebox.lds
|
CLEAN_FILES += arch/arm/lib32/barebox.lds
|
||||||
endif
|
|
||||||
|
|
|
@ -2058,7 +2058,7 @@ config CMD_OF_FIXUP_STATUS
|
||||||
help
|
help
|
||||||
Register a fixup to enable or disable node
|
Register a fixup to enable or disable node
|
||||||
|
|
||||||
Usage: of_fixup_node [-d] path
|
Usage: of_fixup_status [-d] path
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
-d disable node
|
-d disable node
|
||||||
|
|
|
@ -35,6 +35,8 @@ static int do_saveenv(int argc, char *argv[])
|
||||||
case 'z':
|
case 'z':
|
||||||
envfs_flags |= ENVFS_FLAGS_FORCE_BUILT_IN;
|
envfs_flags |= ENVFS_FLAGS_FORCE_BUILT_IN;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
return COMMAND_ERROR_USAGE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -471,7 +471,7 @@ config MENU
|
||||||
select PROCESS_ESCAPE_SEQUENCE
|
select PROCESS_ESCAPE_SEQUENCE
|
||||||
help
|
help
|
||||||
a menu framework that allow us to create list menu to simplify
|
a menu framework that allow us to create list menu to simplify
|
||||||
barebox and make it more user-frendly
|
barebox and make it more user-friendly
|
||||||
|
|
||||||
config PASSWORD
|
config PASSWORD
|
||||||
bool
|
bool
|
||||||
|
@ -844,6 +844,7 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
|
||||||
select CMD_BASENAME
|
select CMD_BASENAME
|
||||||
select CMD_READLINK
|
select CMD_READLINK
|
||||||
select CMD_DIRNAME
|
select CMD_DIRNAME
|
||||||
|
select CMD_TEST
|
||||||
select NVVAR
|
select NVVAR
|
||||||
select CMD_NV
|
select CMD_NV
|
||||||
select FLEXIBLE_BOOTARGS
|
select FLEXIBLE_BOOTARGS
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
|
|
||||||
. /env/config
|
. /env/config
|
||||||
|
|
||||||
|
if [ -f /env/bin/boot_board ]; then
|
||||||
|
. /env/bin/boot_board
|
||||||
|
fi
|
||||||
|
|
||||||
if [ x$kernel_loc = xnet ]; then
|
if [ x$kernel_loc = xnet ]; then
|
||||||
kernel_loc=tftp
|
kernel_loc=tftp
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -23,9 +23,8 @@ if [ -f /env/bin/init_board ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "\e[?25h"
|
echo -e "\e[?25h"
|
||||||
if [ -f /env/bin/boot_board ]; then
|
|
||||||
. /env/bin/boot_board
|
if [ -n $autoboot_timeout ]; then
|
||||||
elif [ -n $autoboot_timeout ]; then
|
|
||||||
echo -n "Hit any key to stop autoboot: "
|
echo -n "Hit any key to stop autoboot: "
|
||||||
timeout -a $autoboot_timeout
|
timeout -a $autoboot_timeout
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
|
|
|
@ -212,7 +212,7 @@ static u64 mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int host
|
||||||
struct variant_data *variant = host->variant;
|
struct variant_data *variant = host->variant;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
int count = readl(base + MMCIFIFOCNT) << 2;
|
int count = host_remain - (readl(base + MMCIFIFOCNT) << 2);
|
||||||
|
|
||||||
if (count > host_remain)
|
if (count > host_remain)
|
||||||
count = host_remain;
|
count = host_remain;
|
||||||
|
@ -264,7 +264,6 @@ static int read_bytes(struct mci_host *mci, char *dest, unsigned int blkcount, u
|
||||||
dev_dbg(host->hw_dev, "read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize);
|
dev_dbg(host->hw_dev, "read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
mmci_writel(host, MMCIDATACTRL, mmci_readl(host, MMCIDATACTRL));
|
|
||||||
len = mmci_pio_read(host, dest, xfercount);
|
len = mmci_pio_read(host, dest, xfercount);
|
||||||
xfercount -= len;
|
xfercount -= len;
|
||||||
dest += len;
|
dest += len;
|
||||||
|
|
|
@ -219,6 +219,7 @@ static struct __init {
|
||||||
{ 0x0a, MC13892_REVISION_1_2, "1.2" },
|
{ 0x0a, MC13892_REVISION_1_2, "1.2" },
|
||||||
{ 0x10, MC13892_REVISION_2_0, "2.0" },
|
{ 0x10, MC13892_REVISION_2_0, "2.0" },
|
||||||
{ 0x11, MC13892_REVISION_2_1, "2.1" },
|
{ 0x11, MC13892_REVISION_2_1, "2.1" },
|
||||||
|
{ 0x14, MC13892_REVISION_2_4, "2.4" },
|
||||||
{ 0x18, MC13892_REVISION_3_0, "3.0" },
|
{ 0x18, MC13892_REVISION_3_0, "3.0" },
|
||||||
{ 0x19, MC13892_REVISION_3_1, "3.1" },
|
{ 0x19, MC13892_REVISION_3_1, "3.1" },
|
||||||
{ 0x1a, MC13892_REVISION_3_2, "3.2" },
|
{ 0x1a, MC13892_REVISION_3_2, "3.2" },
|
||||||
|
|
|
@ -311,8 +311,6 @@ static struct phy_device *of_phy_register_fixed_link(struct device_node *np,
|
||||||
phydev->registered = 1;
|
phydev->registered = 1;
|
||||||
phydev->speed = 1000;
|
phydev->speed = 1000;
|
||||||
phydev->duplex = 1;
|
phydev->duplex = 1;
|
||||||
phydev->pause = phydev->asym_pause = 0;
|
|
||||||
phydev->link = 1;
|
|
||||||
|
|
||||||
return phydev;
|
return phydev;
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,12 +127,13 @@
|
||||||
#define MC13892_REVISION_2_0 3
|
#define MC13892_REVISION_2_0 3
|
||||||
#define MC13892_REVISION_2_0a 4
|
#define MC13892_REVISION_2_0a 4
|
||||||
#define MC13892_REVISION_2_1 5
|
#define MC13892_REVISION_2_1 5
|
||||||
#define MC13892_REVISION_3_0 6
|
#define MC13892_REVISION_2_4 6
|
||||||
#define MC13892_REVISION_3_1 7
|
#define MC13892_REVISION_3_0 7
|
||||||
#define MC13892_REVISION_3_2 8
|
#define MC13892_REVISION_3_1 8
|
||||||
#define MC13892_REVISION_3_2a 9
|
#define MC13892_REVISION_3_2 9
|
||||||
#define MC13892_REVISION_3_3 10
|
#define MC13892_REVISION_3_2a 10
|
||||||
#define MC13892_REVISION_3_5 11
|
#define MC13892_REVISION_3_3 11
|
||||||
|
#define MC13892_REVISION_3_5 12
|
||||||
|
|
||||||
#define MC13783_SWX_VOLTAGE(x) ((x) & 0x3f)
|
#define MC13783_SWX_VOLTAGE(x) ((x) & 0x3f)
|
||||||
#define MC13783_SWX_VOLTAGE_DVS(x) (((x) & 0x3f) << 6)
|
#define MC13783_SWX_VOLTAGE_DVS(x) (((x) & 0x3f) << 6)
|
||||||
|
|
|
@ -641,7 +641,7 @@ char *skip_spaces(const char *str)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* strim - Removes leading and trailing whitespace from @s.
|
* strim - Removes trailing whitespace from @s.
|
||||||
* @s: The string to be stripped.
|
* @s: The string to be stripped.
|
||||||
*
|
*
|
||||||
* Note that the first trailing whitespace is replaced with a %NUL-terminator
|
* Note that the first trailing whitespace is replaced with a %NUL-terminator
|
||||||
|
|
Loading…
Reference in New Issue