summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/cpu/armv7/nonsec_virt.S18
-rw-r--r--arch/arm/cpu/armv7/virt-v7.c20
-rw-r--r--common/cmd_ext2.c5
-rw-r--r--common/cmd_ext4.c5
-rw-r--r--common/cmd_fat.c5
-rw-r--r--common/cmd_fs.c6
-rw-r--r--common/cmd_mtdparts.c7
-rw-r--r--doc/README.JFFS2_NAND2
-rw-r--r--drivers/pci/pci_auto.c2
-rw-r--r--drivers/power/power_core.c19
-rw-r--r--fs/fs.c16
-rw-r--r--include/fs.h4
-rw-r--r--include/linux/fb.h1
13 files changed, 38 insertions, 72 deletions
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 358348ffa5..24b4c18bd4 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -3,23 +3,7 @@
*
* Copyright (c) 2013 Andre Przywara <andre.przywara@linaro.org>
*
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <config.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 6de7fe7813..2cd604f97f 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -1,28 +1,12 @@
/*
* (C) Copyright 2013
- * Andre Przywara, Linaro
+ * Andre Przywara, Linaro <andre.przywara@linaro.org>
*
* Routines to transition ARMv7 processors from secure into non-secure state
* and from non-secure SVC into HYP mode
* needed to enable ARMv7 virtualization for current hypervisors
*
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 173191980e..5a4bcc1a36 100644
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -32,7 +32,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
*/
int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT);
}
U_BOOT_CMD(
@@ -47,6 +47,5 @@ U_BOOT_CMD(
"load binary file from a Ext2 filesystem",
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n"
- " to address 'addr' from ext2 filesystem.\n"
- " All numeric parameters are assumed to be hex."
+ " to address 'addr' from ext2 filesystem."
);
diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c
index 4a27cd97c0..8289d25b06 100644
--- a/common/cmd_ext4.c
+++ b/common/cmd_ext4.c
@@ -45,7 +45,7 @@
int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc,
char *const argv[])
{
- return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT, 16);
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT);
}
int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
@@ -122,5 +122,4 @@ U_BOOT_CMD(ext4load, 6, 0, do_ext4_load,
"load binary file from a Ext4 filesystem",
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n"
- " to address 'addr' from ext4 filesystem.\n"
- " All numeric parameters are assumed to be hex.");
+ " to address 'addr' from ext4 filesystem");
diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index f6d7affa0d..a12d8fa098 100644
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -19,7 +19,7 @@
int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT, 16);
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
}
@@ -35,8 +35,7 @@ U_BOOT_CMD(
" the load stops on end of file.\n"
" If either 'pos' or 'bytes' are not aligned to\n"
" ARCH_DMA_MINALIGN then a misaligned buffer warning will\n"
- " be printed and performance will suffer for the load.\n"
- " All numeric parameters are assumed to be hex."
+ " be printed and performance will suffer for the load."
);
static int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/common/cmd_fs.c b/common/cmd_fs.c
index a681d03d1b..91a205ac1e 100644
--- a/common/cmd_fs.c
+++ b/common/cmd_fs.c
@@ -22,7 +22,7 @@
int do_load_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0);
+ return do_load(cmdtp, flag, argc, argv, FS_TYPE_ANY);
}
U_BOOT_CMD(
@@ -34,9 +34,7 @@ U_BOOT_CMD(
" 'bytes' gives the size to load in bytes.\n"
" If 'bytes' is 0 or omitted, the file is read until the end.\n"
" 'pos' gives the file byte position to start reading from.\n"
- " If 'pos' is 0 or omitted, the file is read from the start.\n"
- " All numeric parameters are assumed to be decimal,\n"
- " unless specified otherwise using a leading \"0x\"."
+ " If 'pos' is 0 or omitted, the file is read from the start."
);
int do_ls_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
index 38a6e6d07e..f791372de1 100644
--- a/common/cmd_mtdparts.c
+++ b/common/cmd_mtdparts.c
@@ -381,10 +381,9 @@ static int part_validate_eraseblock(struct mtdids *id, struct part_info *part)
/**
- * Performs sanity check for supplied partition. Offset and size are verified
- * to be within valid range. Partition type is checked and either
- * parts_validate_nor() or parts_validate_nand() is called with the argument
- * of part.
+ * Performs sanity check for supplied partition. Offset and size are
+ * verified to be within valid range. Partition type is checked and
+ * part_validate_eraseblock() is called with the argument of part.
*
* @param id of the parent device
* @param part partition to validate
diff --git a/doc/README.JFFS2_NAND b/doc/README.JFFS2_NAND
index 5018ae8342..09788d5348 100644
--- a/doc/README.JFFS2_NAND
+++ b/doc/README.JFFS2_NAND
@@ -1,6 +1,6 @@
JFFS2 NAND support:
-To ebable, use the following #define in the board configuration file:
+To enable, use the following #define in the board configuration file:
#define CONFIG_JFFS2_NAND 1
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index c4ed8ba6c3..86ba6b523c 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -297,7 +297,7 @@ void pciauto_config_init(struct pci_controller *hose)
{
int i;
- hose->pci_io = hose->pci_mem = NULL;
+ hose->pci_io = hose->pci_mem = hose->pci_prefetch = NULL;
for (i = 0; i < hose->region_count; i++) {
switch(hose->regions[i].flags) {
diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index d79971ba88..29ccc831af 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -184,18 +184,21 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc < 4)
return CMD_RET_USAGE;
+ if (!p->pbat) {
+ printf("%s is not a battery\n", p->name);
+ return CMD_RET_FAILURE;
+ }
+
if (strcmp(argv[3], "state") == 0)
p->fg->fg_battery_check(p->pbat->fg, p);
if (strcmp(argv[3], "charge") == 0) {
- if (p->pbat) {
- printf("BAT: %s charging (ctrl+c to break)\n",
- p->name);
- if (p->low_power_mode)
- p->low_power_mode();
- if (p->pbat->battery_charge)
- p->pbat->battery_charge(p);
- }
+ printf("BAT: %s charging (ctrl+c to break)\n",
+ p->name);
+ if (p->low_power_mode)
+ p->low_power_mode();
+ if (p->pbat->battery_charge)
+ p->pbat->battery_charge(p);
}
return CMD_RET_SUCCESS;
diff --git a/fs/fs.c b/fs/fs.c
index 99e516a44d..be1855d129 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -231,7 +231,7 @@ int fs_write(const char *filename, ulong addr, int offset, int len)
}
int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- int fstype, int cmdline_base)
+ int fstype)
{
unsigned long addr;
const char *addr_str;
@@ -250,7 +250,7 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
return 1;
if (argc >= 4) {
- addr = simple_strtoul(argv[3], NULL, cmdline_base);
+ addr = simple_strtoul(argv[3], NULL, 16);
} else {
addr_str = getenv("loadaddr");
if (addr_str != NULL)
@@ -268,11 +268,11 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
}
}
if (argc >= 6)
- bytes = simple_strtoul(argv[5], NULL, cmdline_base);
+ bytes = simple_strtoul(argv[5], NULL, 16);
else
bytes = 0;
if (argc >= 7)
- pos = simple_strtoul(argv[6], NULL, cmdline_base);
+ pos = simple_strtoul(argv[6], NULL, 16);
else
pos = 0;
@@ -313,7 +313,7 @@ int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
}
int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- int fstype, int cmdline_base)
+ int fstype)
{
unsigned long addr;
const char *filename;
@@ -329,10 +329,10 @@ int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
return 1;
filename = argv[3];
- addr = simple_strtoul(argv[4], NULL, cmdline_base);
- bytes = simple_strtoul(argv[5], NULL, cmdline_base);
+ addr = simple_strtoul(argv[4], NULL, 16);
+ bytes = simple_strtoul(argv[5], NULL, 16);
if (argc >= 7)
- pos = simple_strtoul(argv[6], NULL, cmdline_base);
+ pos = simple_strtoul(argv[6], NULL, 16);
else
pos = 0;
diff --git a/include/fs.h b/include/fs.h
index c837bae25c..7d9403ed87 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -59,10 +59,10 @@ int fs_read(const char *filename, ulong addr, int offset, int len);
* to a specific filesystem type via the fstype parameter.
*/
int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- int fstype, int cmdline_base);
+ int fstype);
int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
int fstype);
int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
- int fstype, int cmdline_base);
+ int fstype);
#endif /* _FS_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3858f8f80f..111372c9fd 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -2,6 +2,7 @@
#define _LINUX_FB_H
#include <linux/types.h>
+#include <linux/list.h>
/* Definitions of frame buffers */
View Lorry Controller Status