vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Another round of macrofication

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-12 14:08:26 +01:00
parent f9ef05770a
commit 5dbb0fc055
4 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/grub/cs5536.h
View file

@ -46,8 +46,15 @@
#define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
#define GRUB_CS5536_SMB_REG_CTRL3 0x6
#define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL
#define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL
#ifdef ASM_FILE
#define GRUB_ULL(x) x
#else
#define GRUB_ULL(x) x ## ULL
#endif
#define GRUB_CS5536_LBAR_ADDR_MASK GRUB_ULL (0x000000000000fff8)
#define GRUB_CS5536_LBAR_ENABLE GRUB_ULL (0x0000000100000000)
#define GRUB_CS5536_LBAR_MASK_MASK GRUB_ULL (0x0000f00000000000)
/* PMON-compatible LBARs. */
#define GRUB_CS5536_LBAR_GPIO 0x0b000

2
include/grub/mips/yeeloong/boot.h
View file

@ -26,5 +26,7 @@
#define GRUB_MACHINE_DDR2_BASE 0xaffffe00
#define GRUB_MACHINE_DDR2_REG1_HI_8BANKS 0x00000001
#define GRUB_MACHINE_DDR2_REG_SIZE 0x8
#define GRUB_MACHINE_DDR2_REG_STEP 0x10
#endif

8
include/grub/mips/yeeloong/pci.h
View file

@ -30,12 +30,12 @@
#define GRUB_MACHINE_PCI_IO_BASE 0xbfd00000
#define GRUB_MACHINE_PCI_CONFSPACE 0xbfe80000
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR 0xbfe00118
#ifndef ASM_FILE
#define GRUB_MACHINE_PCI_CONF_CTRL_REG (*(volatile grub_uint32_t *) 0xbfe00118)
#define GRUB_MACHINE_PCI_CONF_CTRL_REG (*(volatile grub_uint32_t *) \
GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
#define GRUB_MACHINE_PCI_IO_CTRL_REG (*(volatile grub_uint32_t *) 0xbfe00110)
#else
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_HI 0xbfe0
#define GRUB_MACHINE_PCI_CONF_CTRL_REG_LO 0x0118
#endif
#define GRUB_MACHINE_PCI_WIN_MASK_SIZE 6
#define GRUB_MACHINE_PCI_WIN_MASK ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)