Deleting the bootstrap.flm extension workaround from omap3530/beagleboard/bld.inf b/omap3530/beagleboard/bld.inf for the time being.
Bootstrap.flm isn't present in the buildtools GCC_SURGE branch yet and I suspect that bringing it in will break stuff.
/* Cypress Astoria Sdk Version file (cyastsdkversion.h)
## ===========================
##
## Copyright Cypress Semiconductor Corporation, 2006-2009,
## All Rights Reserved
## UNPUBLISHED, LICENSED SOFTWARE.
##
## CONFIDENTIAL AND PROPRIETARY INFORMATION
## WHICH IS THE PROPERTY OF CYPRESS.
##
## Use of this file is governed
## by the license agreement included in the file
##
## <install>/license/license.txt
##
## where <install> is the Cypress software
## installation root directory path.
##
## ===========================
*/
#ifndef _INCLUDED_CYASTSDK_VERSION_H_
#define _INCLUDED_CYASTSDK_VERSION_H_
/* Astoria SDK version 1.2.1 */
#define CYAS_MAJOR_VERSION (1)
#define CYAS_MINOR_VERSION (2)
#define CYAS_BUILD_NUMBER (197)
#endif /*_INCLUDED_CYASTSDK_VERSION_H_*/