Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

common: Move and rename CONFIG_SYS_SUPPORT_64BIT_DATA

Browse source 
This is not really a CONFIG since it is not intended to be set by boards.
Move it into the compiler header with other similar defines, and rename
it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-28 10:45:10 -07:00 committed by Tom Rini
parent 6df75135b5
commit 4d979bfdbc
7 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -2460,7 +2460,7 @@ typically in board_init_f() and board_init_r().
Configuration Settings: Configuration Settings:
----------------------- -----------------------
- CONFIG_SYS_SUPPORT_64BIT_DATA: Defined automatically if compiled as 64-bit. - MEM_SUPPORT_64BIT_DATA: Defined automatically if compiled as 64-bit.
Optionally it can be defined to support 64-bit memory commands. Optionally it can be defined to support 64-bit memory commands.
- CONFIG_SYS_LONGHELP: Defined when you want long help messages included; - CONFIG_SYS_LONGHELP: Defined when you want long help messages included;

54
cmd/mem.c
View file

@ -107,7 +107,7 @@ static int do_mem_nm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
u64 writeval; u64 writeval;
#else #else
ulong writeval; ulong writeval;
@ -132,7 +132,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Get the value to write. /* Get the value to write.
*/ */
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
writeval = simple_strtoull(argv[2], NULL, 16); writeval = simple_strtoull(argv[2], NULL, 16);
#else #else
writeval = simple_strtoul(argv[2], NULL, 16); writeval = simple_strtoul(argv[2], NULL, 16);
@ -151,7 +151,7 @@ static int do_mem_mw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
while (count-- > 0) { while (count-- > 0) {
if (size == 4) if (size == 4)
*((u32 *)buf) = (u32)writeval; *((u32 *)buf) = (u32)writeval;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
else if (size == 8) else if (size == 8)
*((u64 *)buf) = (u64)writeval; *((u64 *)buf) = (u64)writeval;
#endif #endif
@ -228,7 +228,7 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int rcode = 0; int rcode = 0;
const char *type; const char *type;
const void *buf1, *buf2, *base; const void *buf1, *buf2, *base;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
u64 word1, word2; u64 word1, word2;
#else #else
ulong word1, word2; ulong word1, word2;
@ -260,7 +260,7 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (size == 4) { if (size == 4) {
word1 = *(u32 *)buf1; word1 = *(u32 *)buf1;
word2 = *(u32 *)buf2; word2 = *(u32 *)buf2;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
} else if (size == 8) { } else if (size == 8) {
word1 = *(u64 *)buf1; word1 = *(u64 *)buf1;
word2 = *(u64 *)buf2; word2 = *(u64 *)buf2;
@ -274,7 +274,7 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
if (word1 != word2) { if (word1 != word2) {
ulong offset = buf1 - base; ulong offset = buf1 - base;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
printf("%s at 0x%p (%#0*llx) != %s at 0x%p (%#0*llx)\n", printf("%s at 0x%p (%#0*llx) != %s at 0x%p (%#0*llx)\n",
type, (void *)(addr1 + offset), size, word1, type, (void *)(addr1 + offset), size, word1,
type, (void *)(addr2 + offset), size, word2); type, (void *)(addr2 + offset), size, word2);
@ -378,7 +378,7 @@ static int do_mem_loop(cmd_tbl_t *cmdtp, int flag, int argc,
{ {
ulong addr, length, i, bytes; ulong addr, length, i, bytes;
int size; int size;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
volatile u64 *llp; volatile u64 *llp;
#endif #endif
volatile u32 *longp; volatile u32 *longp;
@ -411,7 +411,7 @@ static int do_mem_loop(cmd_tbl_t *cmdtp, int flag, int argc,
* If we have only one object, just run infinite loops. * If we have only one object, just run infinite loops.
*/ */
if (length == 1) { if (length == 1) {
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
if (size == 8) { if (size == 8) {
llp = (u64 *)buf; llp = (u64 *)buf;
for (;;) for (;;)
@ -433,7 +433,7 @@ static int do_mem_loop(cmd_tbl_t *cmdtp, int flag, int argc,
i = *cp; i = *cp;
} }
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
if (size == 8) { if (size == 8) {
for (;;) { for (;;) {
llp = (u64 *)buf; llp = (u64 *)buf;
@ -476,7 +476,7 @@ static int do_mem_loopw(cmd_tbl_t *cmdtp, int flag, int argc,
{ {
ulong addr, length, i, bytes; ulong addr, length, i, bytes;
int size; int size;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
volatile u64 *llp; volatile u64 *llp;
u64 data; u64 data;
#else #else
@ -506,7 +506,7 @@ static int do_mem_loopw(cmd_tbl_t *cmdtp, int flag, int argc,
length = simple_strtoul(argv[2], NULL, 16); length = simple_strtoul(argv[2], NULL, 16);
/* data to write */ /* data to write */
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
data = simple_strtoull(argv[3], NULL, 16); data = simple_strtoull(argv[3], NULL, 16);
#else #else
data = simple_strtoul(argv[3], NULL, 16); data = simple_strtoul(argv[3], NULL, 16);
@ -519,7 +519,7 @@ static int do_mem_loopw(cmd_tbl_t *cmdtp, int flag, int argc,
* If we have only one object, just run infinite loops. * If we have only one object, just run infinite loops.
*/ */
if (length == 1) { if (length == 1) {
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
if (size == 8) { if (size == 8) {
llp = (u64 *)buf; llp = (u64 *)buf;
for (;;) for (;;)
@ -541,7 +541,7 @@ static int do_mem_loopw(cmd_tbl_t *cmdtp, int flag, int argc,
*cp = data; *cp = data;
} }
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
if (size == 8) { if (size == 8) {
for (;;) { for (;;) {
llp = (u64 *)buf; llp = (u64 *)buf;
@ -968,7 +968,7 @@ static int
mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[]) mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
{ {
ulong addr; ulong addr;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
u64 i; u64 i;
#else #else
ulong i; ulong i;
@ -1007,7 +1007,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
printf("%08lx:", addr); printf("%08lx:", addr);
if (size == 4) if (size == 4)
printf(" %08x", *((u32 *)ptr)); printf(" %08x", *((u32 *)ptr));
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
else if (size == 8) else if (size == 8)
printf(" %016llx", *((u64 *)ptr)); printf(" %016llx", *((u64 *)ptr));
#endif #endif
@ -1034,7 +1034,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
#endif #endif
else { else {
char *endp; char *endp;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
i = simple_strtoull(console_buffer, &endp, 16); i = simple_strtoull(console_buffer, &endp, 16);
#else #else
i = simple_strtoul(console_buffer, &endp, 16); i = simple_strtoul(console_buffer, &endp, 16);
@ -1046,7 +1046,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
bootretry_reset_cmd_timeout(); bootretry_reset_cmd_timeout();
if (size == 4) if (size == 4)
*((u32 *)ptr) = i; *((u32 *)ptr) = i;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
else if (size == 8) else if (size == 8)
*((u64 *)ptr) = i; *((u64 *)ptr) = i;
#endif #endif
@ -1140,7 +1140,7 @@ static int do_random(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
md, 3, 1, do_mem_md, md, 3, 1, do_mem_md,
"memory display", "memory display",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address [# of objects]" "[.b, .w, .l, .q] address [# of objects]"
#else #else
"[.b, .w, .l] address [# of objects]" "[.b, .w, .l] address [# of objects]"
@ -1151,7 +1151,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
mm, 2, 1, do_mem_mm, mm, 2, 1, do_mem_mm,
"memory modify (auto-incrementing address)", "memory modify (auto-incrementing address)",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address" "[.b, .w, .l, .q] address"
#else #else
"[.b, .w, .l] address" "[.b, .w, .l] address"
@ -1162,7 +1162,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
nm, 2, 1, do_mem_nm, nm, 2, 1, do_mem_nm,
"memory modify (constant address)", "memory modify (constant address)",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address" "[.b, .w, .l, .q] address"
#else #else
"[.b, .w, .l] address" "[.b, .w, .l] address"
@ -1172,7 +1172,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
mw, 4, 1, do_mem_mw, mw, 4, 1, do_mem_mw,
"memory write (fill)", "memory write (fill)",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address value [count]" "[.b, .w, .l, .q] address value [count]"
#else #else
"[.b, .w, .l] address value [count]" "[.b, .w, .l] address value [count]"
@ -1182,7 +1182,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
cp, 4, 1, do_mem_cp, cp, 4, 1, do_mem_cp,
"memory copy", "memory copy",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] source target count" "[.b, .w, .l, .q] source target count"
#else #else
"[.b, .w, .l] source target count" "[.b, .w, .l] source target count"
@ -1192,7 +1192,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
cmp, 4, 1, do_mem_cmp, cmp, 4, 1, do_mem_cmp,
"memory compare", "memory compare",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] addr1 addr2 count" "[.b, .w, .l, .q] addr1 addr2 count"
#else #else
"[.b, .w, .l] addr1 addr2 count" "[.b, .w, .l] addr1 addr2 count"
@ -1243,7 +1243,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
loop, 3, 1, do_mem_loop, loop, 3, 1, do_mem_loop,
"infinite loop on address range", "infinite loop on address range",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address number_of_objects" "[.b, .w, .l, .q] address number_of_objects"
#else #else
"[.b, .w, .l] address number_of_objects" "[.b, .w, .l] address number_of_objects"
@ -1254,7 +1254,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
loopw, 4, 1, do_mem_loopw, loopw, 4, 1, do_mem_loopw,
"infinite write loop on address range", "infinite write loop on address range",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address number_of_objects data_to_write" "[.b, .w, .l, .q] address number_of_objects data_to_write"
#else #else
"[.b, .w, .l] address number_of_objects data_to_write" "[.b, .w, .l] address number_of_objects data_to_write"
@ -1274,7 +1274,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
mdc, 4, 1, do_mem_mdc, mdc, 4, 1, do_mem_mdc,
"memory display cyclic", "memory display cyclic",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address count delay(ms)" "[.b, .w, .l, .q] address count delay(ms)"
#else #else
"[.b, .w, .l] address count delay(ms)" "[.b, .w, .l] address count delay(ms)"
@ -1284,7 +1284,7 @@ U_BOOT_CMD(
U_BOOT_CMD( U_BOOT_CMD(
mwc, 4, 1, do_mem_mwc, mwc, 4, 1, do_mem_mwc,
"memory write cyclic", "memory write cyclic",
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
"[.b, .w, .l, .q] address value delay(ms)" "[.b, .w, .l, .q] address value delay(ms)"
#else #else
"[.b, .w, .l] address value delay(ms)" "[.b, .w, .l] address value delay(ms)"

2
common/command.c
View file

@ -469,7 +469,7 @@ int cmd_get_data_size(char* arg, int default_size)
return 2; return 2;
case 'l': case 'l':
return 4; return 4;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
case 'q': case 'q':
return 8; return 8;
#endif #endif

4
include/common.h
View file

@ -35,10 +35,6 @@
#include <flash.h> #include <flash.h>
#include <image.h> #include <image.h>
#ifdef __LP64__
#define CONFIG_SYS_SUPPORT_64BIT_DATA
#endif
#include <log.h> #include <log.h>
#include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/u-boot.h> /* boot information for Linux kernel */

4
include/compiler.h
View file

@ -144,4 +144,8 @@ typedef unsigned long int uintptr_t;
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0) #define unlikely(x) __builtin_expect(!!(x), 0)
#ifdef __LP64__
#define MEM_SUPPORT_64BIT_DATA
#endif
#endif #endif

8
lib/display_options.c
View file

@ -137,7 +137,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
{ {
/* linebuf as a union causes proper alignment */ /* linebuf as a union causes proper alignment */
union linebuf { union linebuf {
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
uint64_t uq[MAX_LINE_LENGTH_BYTES/sizeof(uint64_t) + 1]; uint64_t uq[MAX_LINE_LENGTH_BYTES/sizeof(uint64_t) + 1];
#endif #endif
uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1]; uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1];
@ -145,7 +145,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
uint8_t uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1]; uint8_t uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1];
} lb; } lb;
int i; int i;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
uint64_t __maybe_unused x; uint64_t __maybe_unused x;
#else #else
uint32_t __maybe_unused x; uint32_t __maybe_unused x;
@ -168,7 +168,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
for (i = 0; i < thislinelen; i++) { for (i = 0; i < thislinelen; i++) {
if (width == 4) if (width == 4)
x = lb.ui[i] = *(volatile uint32_t *)data; x = lb.ui[i] = *(volatile uint32_t *)data;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA #ifdef MEM_SUPPORT_64BIT_DATA
else if (width == 8) else if (width == 8)
x = lb.uq[i] = *(volatile uint64_t *)data; x = lb.uq[i] = *(volatile uint64_t *)data;
#endif #endif
@ -178,7 +178,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
x = lb.uc[i] = *(volatile uint8_t *)data; x = lb.uc[i] = *(volatile uint8_t *)data;
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_BUILD)
printf(" %x", (uint)x); printf(" %x", (uint)x);
#elif defined(CONFIG_SYS_SUPPORT_64BIT_DATA) #elif defined(MEM_SUPPORT_64BIT_DATA)
printf(" %0*llx", width * 2, (long long)x); printf(" %0*llx", width * 2, (long long)x);
#else #else
printf(" %0*x", width * 2, x); printf(" %0*x", width * 2, x);

1
scripts/config_whitelist.txt
View file

@ -3888,7 +3888,6 @@ CONFIG_SYS_STACK_SIZE
CONFIG_SYS_STATUS_C CONFIG_SYS_STATUS_C
CONFIG_SYS_STATUS_OK CONFIG_SYS_STATUS_OK
CONFIG_SYS_STMICRO_BOOT CONFIG_SYS_STMICRO_BOOT
CONFIG_SYS_SUPPORT_64BIT_DATA
CONFIG_SYS_SXCNFG_VAL CONFIG_SYS_SXCNFG_VAL
CONFIG_SYS_TBIPA_VALUE CONFIG_SYS_TBIPA_VALUE
CONFIG_SYS_TCLK CONFIG_SYS_TCLK