[U-Boot] [PATCH][Upstream] cmd_sf: include header file common.h before div64.h

The header file div64.h includes <asm/types.h> which defines the phys_addr_t according to the macro CONFIG_PHYS_64BIT, while the macro CONFIG_PHYS_64BIT is included in common.h which comes after div64.h, so in order to get consistent type definition for phys_addr_t, common.h should be included before div64.h, Or else, the parameters of phys_addr_t type will be passed wrongly when CONFIG_PHYS_64BIT is defined.
Signed-off-by: Mingkai Hu Mingkai.Hu@freescale.com --- Based on master branch of git://git.denx.de/u-boot.git Also can apply direcly to git://www.denx.de/git/u-boot-mpc85xx.git
Tested on P2041RDB board.
common/cmd_sf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index b175358..bd3c508 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -5,8 +5,8 @@ * Licensed under the GPL-2 or later. */
-#include <div64.h> #include <common.h> +#include <div64.h> #include <malloc.h> #include <spi_flash.h>

On Sun, Apr 07, 2013 at 10:13:32PM -0000, Mingkai Hu wrote:
The header file div64.h includes <asm/types.h> which defines the phys_addr_t according to the macro CONFIG_PHYS_64BIT, while the macro CONFIG_PHYS_64BIT is included in common.h which comes after div64.h, so in order to get consistent type definition for phys_addr_t, common.h should be included before div64.h, Or else, the parameters of phys_addr_t type will be passed wrongly when CONFIG_PHYS_64BIT is defined.
Signed-off-by: Mingkai Hu Mingkai.Hu@freescale.com
Applied to u-boot/master, thanks!
participants (2)
-
Mingkai Hu
-
Tom Rini