aboutsummaryrefslogtreecommitdiffstats
path: root/gpxe/src/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-27 15:05:14 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-27 15:05:14 -0700
commit81fe1de46aa4ae26a08ade0caa851beba47e901e (patch)
treecd59c640db4ad42fe29baf0cd397ee6797e05ef7 /gpxe/src/include
parent94d0e102ccb4c7bdf63eff16391b14fc547e4780 (diff)
downloadsyslinux.git-81fe1de46aa4ae26a08ade0caa851beba47e901e.tar.gz
syslinux.git-81fe1de46aa4ae26a08ade0caa851beba47e901e.tar.xz
syslinux.git-81fe1de46aa4ae26a08ade0caa851beba47e901e.zip
Update gPXE to current gitsyslinux-3.70-pre28
There are some build fixes which may be relevant, so pull in the latest gPXE git.
Diffstat (limited to 'gpxe/src/include')
-rw-r--r--gpxe/src/include/compiler.h2
-rw-r--r--gpxe/src/include/gpxe/spi.h9
2 files changed, 10 insertions, 1 deletions
diff --git a/gpxe/src/include/compiler.h b/gpxe/src/include/compiler.h
index 1d4312a6..8ab7b8ae 100644
--- a/gpxe/src/include/compiler.h
+++ b/gpxe/src/include/compiler.h
@@ -345,7 +345,7 @@ extern void dbg_hex_dump_da ( unsigned long dispaddr,
* @endcode
*
*/
-#define __shared __asm__ ( "_shared_bss" )
+#define __shared __asm__ ( "_shared_bss" ) __aligned
/**
* Optimisation barrier
diff --git a/gpxe/src/include/gpxe/spi.h b/gpxe/src/include/gpxe/spi.h
index fe38cb6b..8f90e3d4 100644
--- a/gpxe/src/include/gpxe/spi.h
+++ b/gpxe/src/include/gpxe/spi.h
@@ -225,6 +225,15 @@ init_at25040 ( struct spi_device *device ) {
init_spi ( device );
}
+/** ST M25P32 serial flash */
+static inline __attribute__ (( always_inline )) void
+init_m25p32 ( struct spi_device *device ) {
+ device->address_len = 24;
+ device->nvs.size = ( 4 * 1024 * 1024 );
+ device->nvs.block_size = 256;
+ init_spi ( device );
+}
+
/** Microchip 25XX640 serial EEPROM */
static inline __attribute__ (( always_inline )) void
init_mc25xx640 ( struct spi_device *device ) {