diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-06 14:11:57 +0200 |
| commit | 497d1c49f4b75a6827bb400513d53a39dc8bb57c (patch) | |
| tree | 3227133463cb942c4d5be45108aab82e79daa98c /arch/arm/include/asm/barebox-arm-head.h | |
| parent | 94418c2d0d3d7dbaa6995fb53f00a5d5fc9f4028 (diff) | |
| parent | 4024d9ca11295b63dd2b9b795a8f1019b9bba64a (diff) | |
| download | barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.gz barebox-497d1c49f4b75a6827bb400513d53a39dc8bb57c.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/include/asm/barebox-arm-head.h')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm-head.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 0dc3074a27..2c250e948e 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -24,8 +24,7 @@ static inline void barebox_arm_head(void) "1: b 1b\n" "1: b 1b\n" #endif - ".word 0x65726162\n" /* 'bare' */ - ".word 0x00786f62\n" /* 'box' */ + ".asciz \"barebox\"\n" ".word _text\n" /* text base. If copied there, * barebox can skip relocation */ |