diff options
author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 |
commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/nds32/include | |
parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
download | talos-obmc-uboot-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.gz talos-obmc-uboot-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/nds32/include')
-rw-r--r-- | arch/nds32/include/asm/global_data.h | 2 | ||||
-rw-r--r-- | arch/nds32/include/asm/u-boot.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h index 94bd4c2722..b1feb2c0d0 100644 --- a/arch/nds32/include/asm/global_data.h +++ b/arch/nds32/include/asm/global_data.h @@ -44,7 +44,7 @@ typedef struct global_data { bd_t *bd; unsigned long flags; - unsigned long baudrate; + unsigned int baudrate; unsigned long have_console; /* serial_init() was called */ unsigned long reloc_off; /* Relocation Offset */ diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h index b533fea7c5..7b8d8e48fb 100644 --- a/arch/nds32/include/asm/u-boot.h +++ b/arch/nds32/include/asm/u-boot.h @@ -39,7 +39,7 @@ #include <environment.h> typedef struct bd_info { - int bi_baudrate; /* serial console baudrate */ + unsigned int bi_baudrate; /* serial console baudrate */ unsigned long bi_arch_number; /* unique id for this board */ unsigned long bi_boot_params; /* where this board expects params */ unsigned long bi_memstart; /* start of DRAM memory */ |