X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fpm9261.h;h=399d15f9feebc62564f2db991c52bfc26ebaccd4;hb=4b142febff71eabdb7ddbb125c7b583b24ddc434;hp=4784c40d46ea0aa40b57e0971157cdaa5bff40b0;hpb=a48ecc969f8d2d0fe9167962e9b8b4cca52de10b;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 4784c40..399d15f 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -236,7 +236,6 @@ #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA16 - /* NOR flash */ #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 @@ -287,7 +286,7 @@ #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ - "mtdparts=at91_nand:-(root) " \ + "mtdparts=atmel_nand:-(root) " \ "rw rootfstype=jffs2" #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */ @@ -300,7 +299,7 @@ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock5 " \ - "mtdparts=at91_nand:128k(bootstrap)ro," \ + "mtdparts=atmel_nand:128k(bootstrap)ro," \ "256k(uboot)ro,128k(env1)ro," \ "128k(env2)ro,2M(linux),-(root) " \ "rw rootfstype=jffs2" @@ -366,7 +365,6 @@ #define CONFIG_SYS_LONGHELP 1 #define CONFIG_CMDLINE_EDITING 1 -#define ROUND(A, B) (((A) + (B)) & ~((B) - 1)) /* * Size of malloc() pool */