mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
Nokia RX-51: Remove PART* macros
Now when code for defining partitions is duplicated at two locations (option CONFIG_MTDPARTS_DEFAULT in nokia_rx51_defconfig file and macro OMAP_TAG_PARTITION_CONFIG in rx51.c file) there is no need to have common macros. Lets inline PART* macros to rx51.c file. Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
parent
c3cc829d33
commit
f5cfdbf9c9
2 changed files with 6 additions and 54 deletions
|
@ -69,18 +69,12 @@ static struct tag_omap omap[] = {
|
|||
OMAP_TAG_GPIO_SWITCH_CONFIG("sleep_ind", 0xa2, 0x2, 0x2, 0x0),
|
||||
OMAP_TAG_GPIO_SWITCH_CONFIG("slide", GPIO_SLIDE, 0x0, 0x0, 0x0),
|
||||
OMAP_TAG_WLAN_CX3110X_CONFIG(0x25, 0xff, 87, 42, -1),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART1_NAME, PART1_SIZE * PART1_MULL,
|
||||
PART1_OFFS, PART1_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART2_NAME, PART2_SIZE * PART2_MULL,
|
||||
PART2_OFFS, PART2_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART3_NAME, PART3_SIZE * PART3_MULL,
|
||||
PART3_OFFS, PART3_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART4_NAME, PART4_SIZE * PART4_MULL,
|
||||
PART4_OFFS, PART4_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART5_NAME, PART5_SIZE * PART5_MULL,
|
||||
PART5_OFFS, PART5_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG(PART6_NAME, PART6_SIZE * PART6_MULL,
|
||||
PART6_OFFS, PART6_MASK),
|
||||
OMAP_TAG_PARTITION_CONFIG("bootloader", 128 * 1024, 0x00000000, 0x00000003),
|
||||
OMAP_TAG_PARTITION_CONFIG("config", 384 * 1024, 0x00020000, 0x00000000),
|
||||
OMAP_TAG_PARTITION_CONFIG("log", 256 * 1024, 0x00080000, 0x00000000),
|
||||
OMAP_TAG_PARTITION_CONFIG("kernel", 2 * 1024*1024, 0x000c0000, 0x00000000),
|
||||
OMAP_TAG_PARTITION_CONFIG("initfs", 2 * 1024*1024, 0x002c0000, 0x00000000),
|
||||
OMAP_TAG_PARTITION_CONFIG("rootfs", 257280 * 1024, 0x004c0000, 0x00000000),
|
||||
OMAP_TAG_BOOT_REASON_CONFIG("pwr_key"),
|
||||
OMAP_TAG_VERSION_STR_CONFIG("product", "RX-51"),
|
||||
OMAP_TAG_VERSION_STR_CONFIG("hw-build", "2101"),
|
||||
|
|
|
@ -91,48 +91,6 @@
|
|||
* Board ONENAND Info.
|
||||
*/
|
||||
|
||||
#define PART1_NAME "bootloader"
|
||||
#define PART1_SIZE 128
|
||||
#define PART1_MULL 1024
|
||||
#define PART1_SUFF "k"
|
||||
#define PART1_OFFS 0x00000000
|
||||
#define PART1_MASK 0x00000003
|
||||
|
||||
#define PART2_NAME "config"
|
||||
#define PART2_SIZE 384
|
||||
#define PART2_MULL 1024
|
||||
#define PART2_SUFF "k"
|
||||
#define PART2_OFFS 0x00020000
|
||||
#define PART2_MASK 0x00000000
|
||||
|
||||
#define PART3_NAME "log"
|
||||
#define PART3_SIZE 256
|
||||
#define PART3_MULL 1024
|
||||
#define PART3_SUFF "k"
|
||||
#define PART3_OFFS 0x00080000
|
||||
#define PART3_MASK 0x00000000
|
||||
|
||||
#define PART4_NAME "kernel"
|
||||
#define PART4_SIZE 2
|
||||
#define PART4_MULL 1024*1024
|
||||
#define PART4_SUFF "m"
|
||||
#define PART4_OFFS 0x000c0000
|
||||
#define PART4_MASK 0x00000000
|
||||
|
||||
#define PART5_NAME "initfs"
|
||||
#define PART5_SIZE 2
|
||||
#define PART5_MULL 1024*1024
|
||||
#define PART5_SUFF "m"
|
||||
#define PART5_OFFS 0x002c0000
|
||||
#define PART5_MASK 0x00000000
|
||||
|
||||
#define PART6_NAME "rootfs"
|
||||
#define PART6_SIZE 257280
|
||||
#define PART6_MULL 1024
|
||||
#define PART6_SUFF "k"
|
||||
#define PART6_OFFS 0x004c0000
|
||||
#define PART6_MASK 0x00000000
|
||||
|
||||
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
||||
|
||||
/* Watchdog support */
|
||||
|
|
Loading…
Reference in a new issue