diff options
| -rw-r--r-- | src/mainboard/amd/pistachio/Options.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/pistachio/mainboard.c | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/mainboard/amd/pistachio/Options.lb b/src/mainboard/amd/pistachio/Options.lb index 1fd3e92066..a25fb70cf8 100644 --- a/src/mainboard/amd/pistachio/Options.lb +++ b/src/mainboard/amd/pistachio/Options.lb @@ -91,6 +91,7 @@ uses CONFIG_USE_PRINTK_IN_CAR uses CONFIG_VIDEO_MB uses CONFIG_GFXUMA +uses HAVE_MAINBOARD_RESOURCES ### ### Build options @@ -299,6 +300,7 @@ default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON" default CONFIG_VIDEO_MB=1 default CONFIG_GFXUMA=1 +default HAVE_MAINBOARD_RESOURCES=1 ### End Options.lb end diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c index 1b808031bc..96ea307919 100644 --- a/src/mainboard/amd/pistachio/mainboard.c +++ b/src/mainboard/amd/pistachio/mainboard.c @@ -42,6 +42,8 @@ extern int do_smbus_write_byte(u32 smbus_io_base, u32 device, u32 address, #define ADT7475_write_byte(address, val) \ do_smbus_write_byte(SMBUS_IO_BASE, ADT7475_ADDRESS, address, val) +unsigned long uma_memory_start, uma_memory_size; + /******************************************************** * pistachio uses a BCM5787 as on-board NIC. * It has a pin named LOW_POWER to enable it into LOW POWER state. @@ -322,12 +324,23 @@ void pistachio_enable(device_t dev) set_thermal_config(); } +int add_mainboard_resources(struct lb_memory *mem) +{ + /* UMA is removed from system memory in the northbridge code, but + * in some circumstances we want the memory mentioned as reserved. + */ +#if (CONFIG_GFXUMA == 1) + printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", + uma_memory_start, uma_memory_size); + lb_add_memory_range(mem, LB_MEM_RESERVED, + uma_memory_start, uma_memory_size); +#endif +} + /* * CONFIG_CHIP_NAME defined in Option.lb. */ struct chip_operations mainboard_amd_pistachio_ops = { -#if CONFIG_CHIP_NAME == 1 - CHIP_NAME("AMD pistachio Mainboard") -#endif - .enable_dev = pistachio_enable, + CHIP_NAME("AMD Pistachio Mainboard") + .enable_dev = pistachio_enable, }; |